@things-factory/worklist 6.0.45 → 6.0.47

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

@@ -5,8 +5,15 @@ import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
 
-import { AssigneeItem } from '../activity-instance/activity-instance'
-import { Activity, ActivityStatus, ActivityType, ActivityUIType, MultipleInstanceType } from './activity'
+import {
+  Activity,
+  ActivityStartingType,
+  ActivityStatus,
+  ActivityType,
+  ActivityUIType,
+  AssigneeItem,
+  MultipleInstanceType
+} from './activity'
 import { ActivityModelItem } from './activity-model-type'
 import { ActivitySearchKeyItem } from './activity-search-key-item-type'
 
@@ -36,6 +43,9 @@ export class NewActivity {
   @Field({ nullable: true })
   startable?: boolean
 
+  @Field({ nullable: true })
+  startingType?: ActivityStartingType
+
   @Field({ nullable: true })
   multiple?: MultipleInstanceType
 
@@ -120,6 +130,9 @@ export class ActivityPatch {
   @Field({ nullable: true })
   startable?: boolean
 
+  @Field({ nullable: true })
+  startingType?: ActivityStartingType
+
   @Field({ nullable: true })
   multiple?: MultipleInstanceType
 

package/server/service/activity/activity.ts

@@ -13,9 +13,8 @@ import {
 
 import { Role, User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { ApprovalLineItem } from '@things-factory/organization'
+import { OrgMemberTargetType, OrgMemberTarget, ApprovalLineItem } from '@things-factory/organization'
 
-import { AssigneeItem } from '../activity-instance/activity-instance'
 import { ActivityModelItem } from './activity-model-type'
 import { ActivitySearchKeyItem } from './activity-search-key-item-type'
 
@@ -30,6 +29,17 @@ registerEnumType(ActivityStatus, {
   description: 'state enumeration of a activity'
 })
 
+export enum ActivityStartingType {
+  None = '',
+  Post = 'post',
+  Issue = 'issue'
+}
+
+registerEnumType(ActivityStartingType, {
+  name: 'ActivityStartingType',
+  description: 'whether the purpose of starting the activity is to issue or post'
+})
+
 export enum ActivityType {
   Task = 'task',
   Service = 'service',
@@ -73,6 +83,18 @@ registerEnumType(ActivityUIType, {
   description: 'user-interface type enumeration of a activity'
 })
 
+@ObjectType()
+export class AssigneeItem {
+  @Field(type => OrgMemberTargetType, { nullable: true })
+  type?: OrgMemberTargetType
+
+  @Field({ nullable: true })
+  value?: string
+
+  @Field(type => OrgMemberTarget, { nullable: true })
+  assignee?: OrgMemberTarget
+}
+
 @Entity()
 @Index('ix_activity_0', (activity: Activity) => [activity.domain, activity.name], { unique: true })
 @Index('ix_activity_1', (activity: Activity) => [activity.domain, activity.state, activity.priority], { unique: false })
@@ -125,6 +147,10 @@ export class Activity {
   @Field({ nullable: true, description: 'Whether the task can be started arbitrarily by a user with privileges' })
   startable?: boolean
 
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'Whether the purpose of starting the activity is to issue or post' })
+  startingType?: ActivityStartingType
+
   @Column({ nullable: true })
   @Field({
     nullable: true,

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

@@ -234,7 +234,7 @@ export class ActivityInstanceHistory implements HistoryEntityInterface<ActivityI
 
   isDelegatable(): boolean {
     switch (this.state) {
-      case ActivityInstanceStatus.Posted:
+      case ActivityInstanceStatus.Issued:
       case ActivityInstanceStatus.Assigned:
         return true
       default:

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

@@ -2,29 +2,29 @@ import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { abort, assign, draft, end, pick, post } from '../../controllers/activity-instance'
+import { abort, assign, draft, end, pick, issue } from '../../controllers/activity-instance'
 import { ActivityThread } from '../activity-thread/activity-thread'
 import { ActivityInstance } from './activity-instance'
-import { ActivityInstancePatch, ActivityInstancePost, NewActivityInstance } from './activity-instance-type'
+import { ActivityInstanceIssue, ActivityInstanceDraft } from './activity-instance-type'
 
 @Resolver(ActivityInstance)
 export class ActivityInstanceMutation {
   @Directive('@transaction')
   @Mutation(returns => ActivityInstance, { description: 'To draft standard ActivityInstance' })
   async draftActivityInstance(
-    @Arg('activityInstance') activityInstance: NewActivityInstance,
+    @Arg('activityInstance') activityInstance: ActivityInstanceDraft,
     @Ctx() context: ResolverContext
   ): Promise<ActivityInstance> {
     return await draft(activityInstance, context)
   }
 
   @Directive('@transaction')
-  @Mutation(returns => ActivityInstance, { description: 'To post standard ActivityInstance' })
-  async postActivityInstance(
-    @Arg('activityInstance') activityInstance: ActivityInstancePost,
+  @Mutation(returns => ActivityInstance, { description: 'To issue standard ActivityInstance' })
+  async issueActivityInstance(
+    @Arg('activityInstance') activityInstance: ActivityInstanceIssue,
     @Ctx() context: ResolverContext
   ): Promise<ActivityInstance> {
-    return await post(activityInstance, context)
+    return await issue(activityInstance, context)
   }
 
   @Directive('@transaction')

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

@@ -5,8 +5,8 @@ import { Role, User } from '@things-factory/auth-base'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { ActivityThread } from '../activity-thread/activity-thread'
-import { Activity } from '../activity/activity'
-import { ActivityInstance, ActivityInstanceStatus, AssigneeItem } from './activity-instance'
+import { Activity, AssigneeItem } from '../activity/activity'
+import { ActivityInstance, ActivityInstanceStatus } from './activity-instance'
 import { ActivityInstanceList } from './activity-instance-type'
 import { ApprovalLineItem } from '@things-factory/organization'
 
@@ -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.PendingAssignment]
+        status: [ActivityInstanceStatus.Issued, ActivityInstanceStatus.PendingAssignment]
       })
       .andWhere('ai.assigneeRole IN (:...roles)', { roles })
       .andWhere('threads.id IS NULL') /* 이미 내가 할당된 경우는 제외한다. */

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

@@ -4,10 +4,13 @@ import { Role } from '@things-factory/auth-base'
 import { ObjectRef, ScalarDate, ScalarObject } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
 
-import { ActivityType, ActivityUIType } from '../activity/activity'
-import { AssigneeItem, ActivityInstance, ActivityInstanceStatus } from './activity-instance'
+import { ActivityType, ActivityUIType, AssigneeItem } from '../activity/activity'
+import { ActivityInstance, ActivityInstanceStatus } from './activity-instance'
 @InputType()
-export class NewActivityInstance {
+export class ActivityInstanceDraft {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
   @Field()
   name: string
 
@@ -35,6 +38,9 @@ export class NewActivityInstance {
   @Field(type => ScalarObject, { nullable: true })
   input?: { [key: string]: any }
 
+  @Field(type => ScalarObject, { nullable: true })
+  output?: { [key: string]: any }
+
   @Field({ nullable: true })
   adhocType?: string
 
@@ -70,7 +76,7 @@ export class NewActivityInstance {
 }
 
 @InputType()
-export class ActivityInstancePost {
+export class ActivityInstanceIssue {
   @Field(type => ID, { nullable: true })
   id?: string
 
@@ -101,6 +107,9 @@ export class ActivityInstancePost {
   @Field(type => ScalarObject, { nullable: true })
   input?: { [key: string]: any }
 
+  @Field(type => ScalarObject, { nullable: true })
+  output?: { [key: string]: any }
+
   @Field({ nullable: true })
   adhocType?: string
 

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

@@ -14,14 +14,14 @@ import {
 
 import { Role, User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
-import { OrgMemberTargetType, OrgMemberTarget, ApprovalLineItem } from '@things-factory/organization'
+import { ApprovalLineItem } from '@things-factory/organization'
 
 import { ActivityThread } from '../activity-thread/activity-thread'
-import { Activity, ActivityType, ActivityUIType } from '../activity/activity'
+import { Activity, ActivityType, ActivityUIType, AssigneeItem } from '../activity/activity'
 
 export enum ActivityInstanceStatus {
   Draft = 'draft',
-  Posted = 'posted',
+  Issued = 'issued',
   PendingAssignment = 'pending-assignment',
   Assigned = 'assigned',
   Started = 'started',
@@ -35,18 +35,6 @@ registerEnumType(ActivityInstanceStatus, {
   description: 'state enumeration of a activityInstance'
 })
 
-@ObjectType()
-export class AssigneeItem {
-  @Field(type => OrgMemberTargetType, { nullable: true })
-  type?: OrgMemberTargetType
-
-  @Field({ nullable: true })
-  value?: string
-
-  @Field(type => OrgMemberTarget, { nullable: true })
-  assignee?: OrgMemberTarget
-}
-
 @Entity()
 @Index(
   'ix_activity_instance_0',
@@ -264,7 +252,7 @@ export class ActivityInstance {
 
   isDelegatable(): boolean {
     switch (this.state) {
-      case ActivityInstanceStatus.Posted:
+      case ActivityInstanceStatus.Issued:
       case ActivityInstanceStatus.Assigned:
         return true
       default:

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

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

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

@@ -1,6 +1,6 @@
 import { Field, ObjectType } from 'type-graphql'
 
-import { Activity, ActivityType, ActivityUIType } from '../activity/activity'
+import { Activity, ActivityStartingType, ActivityType, ActivityUIType } from '../activity/activity'
 import { ActivityModelItem } from '../activity/activity-model-type'
 
 @ObjectType({ description: 'Entity for InstallableActivity' })
@@ -29,6 +29,9 @@ export class InstallableActivity {
   @Field({ nullable: true })
   startable?: boolean
 
+  @Field({ nullable: true })
+  startingType?: ActivityStartingType
+
   @Field(type => [ActivityModelItem], { nullable: true })
   model?: ActivityModelItem[]
 

package/things-factory.config.js

@@ -22,7 +22,7 @@ export default {
     { tagname: 'activity-page', page: 'activity' },
     { tagname: 'activity-instance-search-page', page: 'activity-instance-search' },
     { tagname: 'activity-instance-list-page', page: 'activity-instance-list' },
-    { tagname: 'activity-instance-page', page: 'activity-instance' },
+    { tagname: 'activity-instance-start-page', page: 'activity-instance-start' },
     { tagname: 'activity-thread-page', page: 'activity-thread' },
     { tagname: 'activity-thread-view-page', page: 'activity-thread-view' },
     { tagname: 'activity-approval-page', page: 'activity-approval' },

package/translations/en.json

@@ -6,6 +6,7 @@
   "button.delegate": "delegate",
   "button.draft": "draft",
   "button.finish": "finish",
+  "button.issue": "issue",
   "button.pick": "pick",
   "button.post": "post",
   "button.restart": "restart",
@@ -26,10 +27,12 @@
   "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",
@@ -42,6 +45,7 @@
   "field.spec": "spec",
   "field.standard-time": "ST(sec)",
   "field.startable": "startable",
+  "field.starting-type": "starting type",
   "field.started-at": "started at",
   "field.status": "status",
   "field.supervisory-role": "supervisory role",
@@ -56,6 +60,8 @@
   "field.view-type": "view type",
   "field.view-source": "view source",
   "label.activity-instance": "activity instance",
+  "label.activity-starting-type-issue": "issue",
+  "label.activity-starting-type-post": "post",
   "label.activity-state-draft": "draft",
   "label.activity-state-released": "released",
   "label.activity-state-deprecated": "deprecated",
@@ -72,6 +78,9 @@
   "label.activity-state-ended": "ended",
   "label.activity-state-aborted": "aborted",
   "label.days": "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",
@@ -91,6 +100,10 @@
   "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.",
+  "text.task_is_approved_successfully": "task is approved successfully",
+  "text.task_is_rejected_successfully": "task is rejected successfully",
+  "text.task_is_restarted_successfully": "task is restarted successfully",
+  "title.activity application": "activity application",
   "title.activity bank": "activity bank",
   "title.activity shopping": "activity shopping",
   "title.activity list": "activity list",

package/translations/ko.json

@@ -4,8 +4,9 @@
   "button.assign": "할당",
   "button.buy": "구매",
   "button.delegate": "위임",
-  "button.draft": "초안",
+  "button.draft": "초안저장",
   "button.finish": "완료",
+  "button.issue": "이슈",
   "button.pick": "선택",
   "button.post": "게시",
   "button.restart": "재시작",
@@ -26,10 +27,12 @@
   "field.round": "차수",
   "field.judgment": "판정",
   "field.comment": "코멘트",
-  "field.posted-at": "발급일",
+  "field.issued-at": "발급일",
+  "field.posted-at": "게시일",
   "field.issuer-role": "발급자 역할",
   "field.lead-time": "LT(초)",
   "field.mandatory": "필수",
+  "field.multiple": "다중인스턴스",
   "field.options": "선택옵션",
   "field.priority": "우선순위",
   "field.provider": "공급자",
@@ -42,6 +45,7 @@
   "field.spec": "명세",
   "field.standard-time": "ST(초)",
   "field.startable": "수동 시작 가능",
+  "field.starting-type": "시작 유형",
   "field.started-at": "시작 시간",
   "field.status": "상태",
   "field.supervisory-role": "관리자 역할",
@@ -56,6 +60,8 @@
   "field.view-type": "뷰 타입",
   "field.view-source": "뷰 소스",
   "label.activity-instance": "업무 인스턴스",
+  "label.activity-starting-type-issue": "업무 할당",
+  "label.activity-starting-type-post": "업무 게시",
   "label.activity-state-draft": "초안작업중",
   "label.activity-state-posted": "게시됨",
   "label.activity-state-released": "배포됨",
@@ -72,6 +78,9 @@
   "label.activity-state-ended": "완료됨",
   "label.activity-state-aborted": "취소됨",
   "label.days": "일",
+  "label.filter-released": "배포",
+  "label.filter-draft": "초안",
+  "label.filter-deprecated": "폐기",
   "label.filter-aborted": "중단",
   "label.filter-rejected": "반려",
   "label.filter-important": "중요",
@@ -84,13 +93,17 @@
   "label.minutes": "분",
   "label.seconds": "초",
   "text.assign": "할당",
-  "text.draft": "초안",
+  "text.draft": "초안저장",
   "text.installable-activities": "설치 가능 업무",
   "text.pick": "선택",
   "text.save": "저장",
   "text.task_is_finished_successfully": "업무가 성공적으로 완료되었습니다.",
   "text.task_is_saved_successfully": "업무가 성공적으로 저장되었습니다.",
   "text.task_is_started_successfully": "업무가 성공적으로 시작되었습니다.",
+  "text.task_is_approved_successfully": "업무가 성공적으로 승인되었습니다.",
+  "text.task_is_rejected_successfully": "업무가 성공적으로 반려되었습니다.",
+  "text.task_is_restarted_successfully": "업무가 성공적으로 재시작되었습니다.",
+  "title.activity application": "업무 신청서 작성",
   "title.activity bank": "업무 뱅크",
   "title.activity shopping": "업무 쇼핑",
   "title.activity list": "업무정의 리스트",
@@ -103,7 +116,7 @@
   "title.activity reporter list": "업무 현황",
   "title.activity schedule (un)register": "업무 스케쥴 등록/삭제",
   "title.activity starter": "업무 발급",
-  "title.activity starter list": "새업무 할당",
+  "title.activity starter list": "새업무 시작하기",
   "title.activity store": "업무 스토어",
   "title.activity summary": "업무 종합 현황",
   "title.activity template model item list": "업무 템플릿 모델 항목",

package/translations/ms.json

@@ -6,6 +6,7 @@
   "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",
@@ -26,10 +27,12 @@
   "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",
@@ -42,6 +45,7 @@
   "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",
@@ -56,6 +60,8 @@
   "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",
@@ -72,6 +78,9 @@
   "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",
@@ -91,6 +100,10 @@
   "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",

package/translations/zh.json

@@ -6,6 +6,7 @@
   "button.delegate": "[zh] delegate",
   "button.draft": "[zh] draft",
   "button.finish": "[zh] finish",
+  "button.issue": "[zh] issue",
   "button.pick": "[zh] pick",
   "button.post": "[zh] post",
   "button.restart": "[zh] restart",
@@ -26,11 +27,13 @@
   "field.judgment": "judgment",
   "field.comment": "comment",
   "field.hidden": "hidden",
+  "field.issued-at": "issued at",
   "field.posted-at": "posted at",
   "field.provider": "provider",
   "field.issuer-role": "issuer role",
   "field.lead-time": "LT(sec)",
   "field.mandatory": "mandatory",
+  "field.multiple": "multiple",
   "field.options": "options",
   "field.priority": "priority",
   "field.quantifier": "quantifier",
@@ -42,6 +45,7 @@
   "field.report-source": "report source",
   "field.standard-time": "ST(sec)",
   "field.startable": "startable",
+  "field.starting-type": "starting type",
   "field.started-at": "[zh] started at",
   "field.status": "状态",
   "field.supervisory-role": "supervisory role",
@@ -56,6 +60,8 @@
   "field.view-type": "[zh] view type",
   "field.view-source": "[zh] view source",
   "label.activity-instance": "[zh] activity instance",
+  "label.activity-starting-type-issue": "[zh] issue",
+  "label.activity-starting-type-post": "[zh] post",
   "label.activity-state-draft": "[zh] draft",
   "label.activity-state-released": "[zh] released",
   "label.activity-state-deprecated": "[zh] deprecated",
@@ -72,6 +78,9 @@
   "label.activity-state-ended": "[zh] ended",
   "label.activity-state-aborted": "[zh] aborted",
   "label.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",
@@ -91,6 +100,10 @@
   "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.",
+  "text.task_is_approved_successfully": "[zh] task is approved successfully",
+  "text.task_is_rejected_successfully": "[zh] task is rejected successfully",
+  "text.task_is_restarted_successfully": "[zh] task is restarted successfully",
+  "title.activity application": "[zh] activity application",
   "title.activity bank": "[zh] activity bank",
   "title.activity shopping": "[zh] activity shopping",
   "title.activity list": "[zh] activity list",