@things-factory/worklist 6.0.37 → 6.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.37",
+  "version": "6.0.40",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -31,10 +31,10 @@
     "@things-factory/auth-base": "^6.0.34",
     "@things-factory/board-service": "^6.0.34",
     "@things-factory/context-ui": "^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",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "e5452b75c589aded925c61455b320f90e5e4469d"
+  "gitHead": "12f9a90b362b53ed1a8df8bdac015f4a5676a75b"
 }

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

@@ -21,6 +21,10 @@ export async function end(
     )
   }
 
+  if (!activityInstance.startedAt) {
+    activityInstance.startedAt = new Date()
+  }
+
   return await repository.save({
     ...activityInstance,
     reason,

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

@@ -24,6 +24,7 @@ export async function post(
     viewType,
     viewSource,
     dueAt,
+    priority,
     approvalLine,
     activityId,
     activityType,
@@ -76,6 +77,7 @@ export async function post(
     activityInstance.viewSource = viewSource || activity.viewSource
     activityInstance.assigneeRole = assigneeRole || activity.assigneeRole
     activityInstance.supervisoryRole = supervisoryRole || activity.supervisoryRole
+    activityInstance.priority = priority ?? activity.priority
 
     if (!assignees || !approvalLine) {
       activityInstance.adhocType = 'standard'

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

@@ -22,6 +22,10 @@ export async function terminate(
     )
   }
 
+  if (!activityInstance.startedAt) {
+    activityInstance.startedAt = new Date()
+  }
+
   return await repository.save({
     ...activityInstance,
     reason,

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

@@ -22,7 +22,11 @@ export async function abort(
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     reason,
     state: ActivityThreadStatus.Aborted,
@@ -34,5 +38,5 @@ export async function abort(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

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

@@ -15,6 +15,18 @@ export async function adjust(
     relations: ['domain', 'activityInstance', 'assignee', 'creator', 'updater']
   })
 
+  if (!activityThread) {
+    throw new Error(
+      context.t('error.activity-thread not found', {
+        activityThread: id
+      })
+    )
+  }
+
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
   const result = await repository.save({
     ...activityThread,
     ...patch,

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

@@ -21,7 +21,11 @@ export async function end(
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     reason,
     output,
@@ -33,5 +37,5 @@ export async function end(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

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

@@ -1,12 +1,12 @@
-import { ActivityThread } from '../../service/activity-thread/activity-thread'
 import { ActivityThreadSave } from '../../service/activity-thread/activity-thread-type'
 import { updateActivityInstanceState } from '../common'
+import { ActivityThread, ActivityThreadStatus } from '../../service/activity-thread/activity-thread'
 
 export async function save(id: string, save: ActivityThreadSave, context: ResolverContext): Promise<ActivityThread> {
   const { domain, user, tx } = context.state
   const repository = tx.getRepository(ActivityThread)
 
-  const activityThread = await repository.findOne({
+  var activityThread = await repository.findOne({
     where: { domain: { id: domain.id }, id }
   })
 
@@ -18,14 +18,19 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
     )
   }
 
-  const result = await repository.save({
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
+  activityThread = await repository.save({
     ...activityThread,
     ...save,
+    state: ActivityThreadStatus.Started,
     transaction: 'save',
     updater: user
   })
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

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

@@ -25,6 +25,10 @@ export async function submit(
     )
   }
 
+  if (!activityThread.startedAt) {
+    activityThread.startedAt = new Date()
+  }
+
   const approvalLine: ApprovalLineItem[] = activityThread.activityInstance.approvalLine
 
   if (approvalLine && approvalLine.length > 0) {
@@ -46,7 +50,7 @@ export async function submit(
       updater: user
     })
 
-    var result = await repository.save({
+    activityThread = await repository.save({
       ...activityThread,
       reason,
       output,
@@ -55,7 +59,7 @@ export async function submit(
       updater: user
     })
   } else {
-    var result = await repository.save({
+    activityThread = await repository.save({
       ...activityThread,
       reason,
       output,
@@ -69,5 +73,5 @@ export async function submit(
 
   await updateActivityInstanceState(activityThread.activityInstanceId, context)
 
-  return result
+  return activityThread
 }

package/server/controllers/common.ts

@@ -50,7 +50,7 @@ export async function evalActivityInstanceState(
       }
     case threadsMin > validThreads.length:
       return {
-        state: ActivityInstanceStatus.WaitingAssignment
+        state: ActivityInstanceStatus.PendingAssignment
       }
     case pendingStartedThreads.length > 0:
       return {

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

@@ -93,18 +93,6 @@ export class ActivityHistory implements HistoryEntityInterface<Activity> {
   @Field({ nullable: true })
   standardTime?: number
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  cycleTime?: number
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  tactTime?: number
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  leadTime?: number
-
   @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   issuerRole?: Role

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

@@ -48,15 +48,6 @@ export class NewActivity {
   @Field({ nullable: true })
   standardTime?: number
 
-  @Field({ nullable: true })
-  cycleTime?: number
-
-  @Field({ nullable: true })
-  tactTime?: number
-
-  @Field({ nullable: true })
-  leadTime?: number
-
   @Field(type => ObjectRef, { nullable: true })
   issuerRole?: ObjectRef
 
@@ -138,15 +129,6 @@ export class ActivityPatch {
   @Field({ nullable: true })
   standardTime?: number
 
-  @Field({ nullable: true })
-  cycleTime?: number
-
-  @Field({ nullable: true })
-  tactTime?: number
-
-  @Field({ nullable: true })
-  leadTime?: number
-
   @Field(type => ObjectRef, { nullable: true })
   issuerRole?: ObjectRef
 

package/server/service/activity/activity.ts

@@ -45,7 +45,7 @@ export enum ActivityType {
 
 registerEnumType(ActivityType, {
   name: 'ActivityType',
-  description: 'type enumeration of a activity'
+  description: 'type enumeration of a activity based on BPMN 2.0'
 })
 
 export enum ActivityUIType {
@@ -91,7 +91,7 @@ export class Activity {
   description?: string
 
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'BPMN 2.0 task type' })
   activityType?: ActivityType
 
   @Column({ nullable: true })
@@ -111,37 +111,25 @@ export class Activity {
   priority?: number = 1
 
   @Column({ nullable: true })
-  @Field({ nullable: true, description: 'Whether the task can be started arbitrarily by a user with privileges.' })
+  @Field({ nullable: true, description: 'Whether the task can be started arbitrarily by a user with privileges' })
   startable?: boolean
 
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'Autostart schedule in crontab format' })
   schedule?: string
 
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'ID of the autostart schedule registered in the schedule service' })
   scheduleId?: string
 
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'Time zone to which automatic scheduling is applied' })
   timezone?: string
 
   @Column({ nullable: true })
-  @Field({ nullable: true })
+  @Field({ nullable: true, description: 'Standard time for this activity to be performed' })
   standardTime?: number
 
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  cycleTime?: number
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  tactTime?: number
-
-  @Column({ nullable: true })
-  @Field({ nullable: true })
-  leadTime?: number
-
   @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   issuerRole?: Role

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

@@ -34,7 +34,7 @@ export class ActivityApprovalQuery {
   }
 
   @Query(returns => ActivityApprovalList, { description: 'To fetch the list of work results I need to review' })
-  async approvalWaitingList(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityApprovalList> {
+  async approvalPendingList(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ActivityApprovalList> {
     var { domain, user } = context.state
 
     const judgment = [

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

@@ -97,7 +97,7 @@ export class ActivityInstanceQuery {
     })
       .leftJoinAndSelect('ai.activityThreads', 'threads', 'threads.assignee = :user', { user: user.id })
       .andWhere('ai.state IN (:...status)', {
-        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.WaitingAssignment]
+        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.PendingAssignment]
       })
       .andWhere('ai.assigneeRole IN (:...roles)', { roles })
       .andWhere('threads.id IS NULL') /* 이미 내가 할당된 경우는 제외한다. */

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

@@ -22,7 +22,7 @@ import { Activity, ActivityType, ActivityUIType } from '../activity/activity'
 export enum ActivityInstanceStatus {
   Draft = 'draft',
   Posted = 'posted',
-  WaitingAssignment = 'waiting-assignment',
+  PendingAssignment = 'pending-assignment',
   Assigned = 'assigned',
   Started = 'started',
   Pending = 'pending',

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

@@ -38,7 +38,7 @@ export class ActivitySummaryQuery {
   }
 
   @FieldResolver(type => Number)
-  async numberOfApprovalWaitings(
+  async numberOfApprovalPendings(
     @Root() activitySummary: ActivitySummary,
     @Ctx() context: ResolverContext
   ): Promise<number> {
@@ -104,7 +104,7 @@ export class ActivitySummaryQuery {
     })
       .leftJoinAndSelect('ai.activityThreads', 'threads', 'threads.assignee = :user', { user: user.id })
       .andWhere('ai.state IN (:...status)', {
-        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.WaitingAssignment]
+        status: [ActivityInstanceStatus.Posted, ActivityInstanceStatus.PendingAssignment]
       })
       .andWhere('ai.assigneeRole IN (:...roles)', { roles })
       .andWhere('threads.id IS NULL') /* 이미 내가 할당된 경우는 제외한다. */

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

@@ -6,7 +6,7 @@ export class ActivitySummary {
   numberOfToDos?: number
 
   @Field({ nullable: true })
-  numberOfApprovalWaitings?: number
+  numberOfApprovalPendings?: number
 
   @Field({ nullable: true })
   numberOfPicks?: number

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

@@ -23,6 +23,9 @@ export class InstallableActivity {
   @Field({ nullable: true })
   activityType?: ActivityType
 
+  @Field({ nullable: true })
+  priority?: number = 1
+
   @Field({ nullable: true })
   startable?: boolean
 

package/things-factory.config.js

@@ -8,10 +8,9 @@ export default {
     { tagname: 'worklist-home', page: 'worklist-home' },
     { tagname: 'worklist-dashboard', page: 'worklist-dashboard' },
     { tagname: 'pickable-list-page', page: 'pickable-list' },
-    { tagname: 'assigned-list-page', page: 'assigned-list' },
     { tagname: 'todo-list-page', page: 'todo-list' },
     { tagname: 'done-list-page', page: 'done-list' },
-    { tagname: 'approval-waiting-list-page', page: 'approval-waiting-list' },
+    { tagname: 'approval-pending-list-page', page: 'approval-pending-list' },
     { tagname: 'draft-list-page', page: 'draft-list' },
     { tagname: 'starter-list-page', page: 'starter-list' },
     { tagname: 'reporter-list-page', page: 'reporter-list' },

package/translations/en.json

@@ -12,7 +12,9 @@
   "button.start": "start",
   "button.submit": "submit",
   "field.activity-type": "activity type",
+  "field.approval-line": "approval line",
   "field.assignee": "assignee",
+  "field.assignees": "assignees",
   "field.assignee-role": "assignee role",
   "field.cycle-time": "CT(sec)",
   "field.due-at": "due at",
@@ -49,13 +51,28 @@
   "field.view-type": "view type",
   "field.view-source": "view source",
   "label.activity-instance": "activity instance",
+  "label.activity-state-draft": "draft",
+  "label.activity-state-released": "released",
+  "label.activity-state-deprecated": "deprecated",
+  "label.activity-state-posted": "posted",
+  "label.activity-state-pending-assignment": "pending assignment",
+  "label.activity-state-assigned": "assigned",
+  "label.activity-state-started": "started",
+  "label.activity-state-delegated": "delegated",
+  "label.activity-state-submitted": "submitted",
+  "label.activity-state-escalated": "escalated",
+  "label.activity-state-pending": "pending",
+  "label.activity-state-rejected": "rejected",
+  "label.activity-state-ended": "ended",
+  "label.activity-state-aborted": "aborted",
   "label.days": "days",
   "label.filter-aborted": "aborted",
   "label.filter-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
-  "label.filter-rejected": "rejected",
+  "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
+  "label.filter-pending-approval": "pending approval",
   "label.hours": "hours",
   "label.minutes": "minutes",
   "label.seconds": "seconds",
@@ -76,16 +93,21 @@
   "title.activity intro": "activity intro",
   "title.activity preview": "activity preview",
   "title.activity reporter list": "activity reporter list",
+  "title.activity schedule (un)register": "(un)register activity schedule",
   "title.activity starter": "activity starter",
   "title.activity starter list": "activity starter list",
   "title.activity store": "activity store",
   "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 waiting list": "approval waiting list",
+  "title.approval pending list": "approval pending list",
   "title.assigned list": "assigned list",
   "title.done list": "done list",
   "title.draft list": "draft list",
+  "title.edit duration": "edit duration",
   "title.installable activity list": "installable activity list",
-  "title.todo list": "todo list"
+  "title.open this activity page": "open this activity page",
+  "title.pick activity": "pick this activity to handle",
+  "title.todo list": "todo list",
+  "title.view page": "view page"
 }

package/translations/ko.json

@@ -12,7 +12,9 @@
   "button.start": "시작",
   "button.submit": "제출",
   "field.activity-type": "업무 타입",
+  "field.approval-line": "결재선",
   "field.assignee": "피할당자",
+  "field.assignees": "피할당자",
   "field.assignee-role": "피할당 역할",
   "field.cycle-time": "CT(초)",
   "field.due-at": "만기시간",
@@ -49,13 +51,28 @@
   "field.view-type": "뷰 타입",
   "field.view-source": "뷰 소스",
   "label.activity-instance": "업무 인스턴스",
+  "label.activity-state-draft": "초안작업중",
+  "label.activity-state-posted": "게시됨",
+  "label.activity-state-released": "배포됨",
+  "label.activity-state-deprecated": "폐기됨",
+  "label.activity-state-pending-assignment": "할당대기",
+  "label.activity-state-assigned": "할당됨",
+  "label.activity-state-started": "진행중",
+  "label.activity-state-delegated": "위임됨",
+  "label.activity-state-submitted": "제출됨",
+  "label.activity-state-escalated": "승인진행중",
+  "label.activity-state-pending": "지연중",
+  "label.activity-state-rejected": "반려됨",
+  "label.activity-state-ended": "완료됨",
+  "label.activity-state-aborted": "취소됨",
   "label.days": "일",
   "label.filter-aborted": "중단",
   "label.filter-important": "중요",
   "label.filter-due": "만기",
   "label.filter-recent": "최근",
-  "label.filter-rejected": "반려",
+  "label.filter-proceeding": "작업중",
   "label.filter-resubmitted": "재상신",
+  "label.filter-pending-approval": "승인진행중",
   "label.hours": "시간",
   "label.minutes": "분",
   "label.seconds": "초",
@@ -76,16 +93,21 @@
   "title.activity intro": "업무 소개",
   "title.activity preview": "업무 미리보기",
   "title.activity reporter list": "업무 현황",
+  "title.activity schedule (un)register": "업무 스케쥴 등록/삭제",
   "title.activity starter": "업무 발급",
   "title.activity starter list": "새업무 할당",
   "title.activity store": "업무 스토어",
   "title.activity summary": "업무 종합 현황",
   "title.activity template model item list": "업무 템플릿 모델 항목",
   "title.activity template list": "업무 템플릿",
-  "title.approval waiting list": "승인 대기 리스트",
+  "title.approval pending list": "승인 대기 리스트",
   "title.assigned list": "나의 연관 업무 현황",
   "title.done list": "완료한 업무",
   "title.draft list": "작성중인 업무",
+  "title.edit duration": "소요시간 편집",
   "title.installable activity list": "설치 가능 업무",
-  "title.todo list": "나의 할일 리스트"
+  "title.open this activity page": "이 업무 페이지 열기",
+  "title.pick activity": "이 업무를 내가 담당하기위해 선택",
+  "title.todo list": "나의 할일 리스트",
+  "title.view page": "페이지 보기"
 }