@things-factory/worklist 6.0.37 → 6.0.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worklist",
-  "version": "6.0.37",
+  "version": "6.0.39",
   "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.39",
     "@things-factory/scheduler-client": "^6.0.35",
     "@things-factory/shell": "^6.0.34",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "e5452b75c589aded925c61455b320f90e5e4469d"
+  "gitHead": "0785dcb60e33faa110e9d6056909384c4f50b7bf"
 }

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

@@ -1,6 +1,6 @@
-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
@@ -21,6 +21,7 @@ export async function save(id: string, save: ActivityThreadSave, context: Resolv
   const result = await repository.save({
     ...activityThread,
     ...save,
+    state: ActivityThreadStatus.Started,
     transaction: 'save',
     updater: user
   })

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/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,12 +51,27 @@
   "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-waiting-assignment": "waiting 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.hours": "hours",
   "label.minutes": "minutes",
@@ -76,6 +93,7 @@
   "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",
@@ -86,6 +104,8 @@
   "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.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,12 +51,27 @@
   "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-waiting-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.hours": "시간",
   "label.minutes": "분",
@@ -76,6 +93,7 @@
   "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": "업무 스토어",
@@ -86,6 +104,8 @@
   "title.assigned list": "나의 연관 업무 현황",
   "title.done list": "완료한 업무",
   "title.draft list": "작성중인 업무",
+  "title.edit duration": "소요시간 편집",
   "title.installable activity list": "설치 가능 업무",
-  "title.todo list": "나의 할일 리스트"
+  "title.todo list": "나의 할일 리스트",
+  "title.view page": "페이지 보기"
 }

package/translations/ms.json

@@ -1,24 +1,26 @@
 {
-  "button.abort": "abort",
-  "button.approve": "approve",
-  "button.assign": "assign",
-  "button.buy": "buy",
-  "button.delegate": "delegate",
-  "button.draft": "draft",
-  "button.finish": "finish",
-  "button.pick": "pick",
-  "button.post": "post",
-  "button.restart": "restart",
-  "button.start": "start",
-  "button.submit": "submit",
-  "field.activity-type": "activity type",
-  "field.assignee": "assignee",
-  "field.assignee-role": "assigneerole",
-  "field.cycle-time": "CT(sec)",
-  "field.due-at": "due at",
-  "field.due-in": "due in",
-  "field.hidden": "hidden",
-  "field.inout": "inout",
+  "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.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.posted-at": "posted at",
@@ -49,12 +51,27 @@
   "field.view-type": "[ms] view type",
   "field.view-source": "[ms] view source",
   "label.activity-instance": "[ms] activity instance",
+  "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-waiting-assignment": "[ms] waiting 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-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-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
   "label.filter-rejected": "rejected",
+  "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
   "label.hours": "[ms] hours",
   "label.minutes": "[ms] minutes",
@@ -64,28 +81,31 @@
   "text.installable-activities": "[ms] installable activities",
   "text.pick": "[ms] pick",
   "text.save": "[ms] save",
-  "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.",
-  "title.activity bank": "activity bank",
-  "title.activity list": "activity list",
-  "title.activity model item list": "activity model item list",
-  "title.activity instance list": "activity instance list",
-  "title.activity instance search": "activity instance search",
-  "title.activity instance view": "activity instance view",
-  "title.activity intro": "activity intro",
-  "title.activity preview": "activity preview",
-  "title.activity reporter list": "activity reporter list",
-  "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.assigned list": "assigned list",
-  "title.done list": "done list",
-  "title.draft list": "draft list",
-  "title.installable activity list": "installable activity list",
-  "title.todo list": "todo list"
+  "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.",
+  "title.activity bank": "[ms] activity bank",
+  "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 waiting list": "[ms] approval waiting list",
+  "title.assigned list": "[ms] assigned list",
+  "title.done list": "[ms] done list",
+  "title.draft list": "[ms] draft list",
+  "title.edit duration": "[ms] edit duration",
+  "title.installable activity list": "[ms] installable activity list",
+  "title.todo list": "[ms] todo list",
+  "title.view page": "[ms] view page"
 }

package/translations/zh.json

@@ -1,23 +1,25 @@
 {
-  "button.abort": "abort",
-  "button.approve": "approve",
-  "button.assign": "assign",
-  "button.buy": "buy",
-  "button.delegate": "delegate",
-  "button.draft": "draft",
-  "button.finish": "finish",
-  "button.pick": "pick",
-  "button.post": "post",
-  "button.restart": "restart",
-  "button.start": "start",
-  "button.submit": "submit",
-  "field.activity-type": "activity type",
-  "field.assignee": "assignee",
-  "field.assignee-role": "assigneerole",
-  "field.cycle-time": "CT(sec)",
-  "field.due-at": "due at",
-  "field.due-in": "due in",
-  "field.inout": "inout",
+  "button.abort": "[zh] abort",
+  "button.approve": "[zh] approve",
+  "button.assign": "[zh] assign",
+  "button.buy": "[zh] buy",
+  "button.delegate": "[zh] delegate",
+  "button.draft": "[zh] draft",
+  "button.finish": "[zh] finish",
+  "button.pick": "[zh] pick",
+  "button.post": "[zh] post",
+  "button.restart": "[zh] restart",
+  "button.start": "[zh] start",
+  "button.submit": "[zh] submit",
+  "field.activity-type": "[zh] activity type",
+  "field.approval-line": "[zh] approval line",
+  "field.assignee": "[zh] assignee",
+  "field.assignees": "[zh] assignees",
+  "field.assignee-role": "[zh] assigneerole",
+  "field.cycle-time": "[zh] CT(sec)",
+  "field.due-at": "[zh] due at",
+  "field.due-in": "[zh] due in",
+  "field.inout": "[zh] inout",
   "field.input-key": "[zh] input-key",
   "field.issuer": "issuer",
   "field.hidden": "hidden",
@@ -49,12 +51,27 @@
   "field.view-type": "[zh] view type",
   "field.view-source": "[zh] view source",
   "label.activity-instance": "[zh] activity instance",
+  "label.activity-state-draft": "[zh] draft",
+  "label.activity-state-released": "[zh] released",
+  "label.activity-state-deprecated": "[zh] deprecated",
+  "label.activity-state-posted": "[zh] posted",
+  "label.activity-state-waiting-assignment": "[zh] waiting assignment",
+  "label.activity-state-assigned": "[zh] assigned",
+  "label.activity-state-started": "[zh] started",
+  "label.activity-state-delegated": "[zh] delegated",
+  "label.activity-state-submitted": "[zh] submitted",
+  "label.activity-state-escalated": "[zh] escalated",
+  "label.activity-state-pending": "[zh] pending",
+  "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-important": "important",
   "label.filter-due": "due",
   "label.filter-recent": "recent",
   "label.filter-rejected": "rejected",
+  "label.filter-proceeding": "proceeding",
   "label.filter-resubmitted": "resubmitted",
   "label.hours": "小时",
   "label.minutes": "分钟",
@@ -64,28 +81,31 @@
   "text.installable-activities": "[zh] installable activities",
   "text.pick": "[zh] pick",
   "text.save": "[zh] save",
-  "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.",
-  "title.activity bank": "activity bank",
-  "title.activity list": "activity list",
-  "title.activity model item list": "activity model item list",
-  "title.activity instance list": "activity instance list",
-  "title.activity instance search": "activity instance search",
-  "title.activity instance view": "activity instance view",
-  "title.activity intro": "activity intro",
-  "title.activity preview": "activity preview",
-  "title.activity reporter list": "activity reporter list",
-  "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.assigned list": "assigned list",
-  "title.done list": "done list",
-  "title.draft list": "draft list",
-  "title.installable activity list": "installable activity list",
-  "title.todo list": "todo list"
+  "text.task_is_finished_successfully": "[zh] task is finished successfully.",
+  "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 list": "[zh] activity list",
+  "title.activity model item list": "[zh] activity model item list",
+  "title.activity instance list": "[zh] activity instance list",
+  "title.activity instance search": "[zh] activity instance search",
+  "title.activity instance view": "[zh] activity instance view",
+  "title.activity intro": "[zh] activity intro",
+  "title.activity preview": "[zh] activity preview",
+  "title.activity schedule (un)register": "[zh] (un)register activity schedule",
+  "title.activity reporter list": "[zh] activity reporter list",
+  "title.activity starter": "[zh] activity starter",
+  "title.activity starter list": "[zh] activity starter list",
+  "title.activity store": "[zh] activity store",
+  "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 waiting list": "[zh] approval waiting list",
+  "title.assigned list": "[zh] assigned list",
+  "title.done list": "[zh] done list",
+  "title.draft list": "[zh] draft list",
+  "title.edit duration": "[zh] edit duration",
+  "title.installable activity list": "[zh] installable activity list",
+  "title.todo list": "[zh] todo list",
+  "title.view page": "[zh] view page"
 }