@things-factory/organization 7.0.52 → 7.0.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/organization",
-  "version": "7.0.52",
+  "version": "7.0.56",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -24,17 +24,19 @@
     "clean:client": "npx rimraf dist-client",
     "clean:server": "npx rimraf dist-server",
     "clean": "npm run clean:server && npm run clean:client",
-    "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
+    "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
     "@operato/app": "^7.0.0",
     "@operato/contact": "^7.0.0",
     "@operato/data-tree": "^7.0.0",
     "@operato/graphql": "^7.0.0",
+    "@operato/p13n": "^7.0.0",
     "@operato/shell": "^7.0.0",
-    "@things-factory/auth-base": "^7.0.49",
-    "@things-factory/contact": "^7.0.52",
-    "@things-factory/shell": "^7.0.49"
+    "@things-factory/auth-base": "^7.0.55",
+    "@things-factory/code-ui": "^7.0.56",
+    "@things-factory/contact": "^7.0.56",
+    "@things-factory/shell": "^7.0.55"
   },
-  "gitHead": "ff6154d83646d8bd49030984a8122d3d5896d646"
+  "gitHead": "79b01a9ad44568f3b807cbddef256b262a0aa5df"
 }

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

@@ -37,6 +37,24 @@ export class ObjectRefForEmployee extends ObjectRef {
   active?: boolean
 }
 
+@InputType()
+export class ObjectRefForContact extends ObjectRef {
+  @Field(type => GraphQLEmailAddress, { nullable: true })
+  email?: string
+
+  @Field({ nullable: true })
+  phone?: string
+
+  @Field({ nullable: true })
+  address?: string
+}
+
+@InputType()
+export class ObjectRefForDepartment extends ObjectRef {
+  @Field({ nullable: true })
+  controlNo?: string
+}
+
 @InputType()
 export class ObjectRefForUser extends ObjectRef {
   @Field(type => GraphQLEmailAddress, { nullable: true })
@@ -84,8 +102,11 @@ export class NewEmployee {
   @Field(type => ObjectRefForEmployee, { nullable: true })
   supervisor?: ObjectRefForEmployee
 
-  @Field(type => ObjectRef, { nullable: true })
-  department?: ObjectRef
+  @Field(type => ObjectRefForDepartment, { nullable: true })
+  department?: ObjectRefForDepartment
+
+  @Field(type => ObjectRefForContact, { nullable: true })
+  contact?: ObjectRefForContact
 
   @Field(type => ObjectRefForUser, { nullable: true })
   user?: ObjectRefForUser
@@ -132,8 +153,11 @@ export class EmployeePatch {
   @Field(type => ObjectRefForEmployee, { nullable: true })
   supervisor?: ObjectRefForEmployee
 
-  @Field(type => ObjectRef, { nullable: true })
-  department?: ObjectRef
+  @Field(type => ObjectRefForDepartment, { nullable: true })
+  department?: ObjectRefForDepartment
+
+  @Field(type => ObjectRefForContact, { nullable: true })
+  contact?: ObjectRefForContact
 
   @Field(type => ObjectRefForUser, { nullable: true })
   user?: ObjectRefForUser

package/translations/en.json

@@ -4,6 +4,7 @@
   "button.copy from": "copy from",
   "button.detach": "detach",
   "button.edit-detail": "edit detail",
+  "button.edit-contact": "edit contact",
   "field.approver": "approver",
   "field.control-no": "control No.",
   "field.hired-on": "hired on",
@@ -28,6 +29,7 @@
   "label.job-responsibility": "job responsibility",
   "label.job-position": "job position",
   "label.retired-at": "retired at",
+  "prompt.sure to empty approval line ?": "sure to empty approval line ?",
   "title.approval-line editor": "approval line editor",
   "title.approval-line item list": "approval line item list",
   "title.approval-line template list": "approval line template list",

package/translations/ja.json

@@ -3,6 +3,7 @@
   "button.add-sibling-dept": "同等部門追加",
   "button.copy from": "コピーしてくる",
   "button.detach": "連結解除",
+  "button.edit-contact": "連絡先を編集",
   "button.edit-detail": "詳細を編集",
   "field.approver": "決裁者",
   "field.control-no": "管理番号",
@@ -24,10 +25,11 @@
   "label.myself": "私",
   "label.note": "ノート",
   "label.picture": "写真",
-  "label.alias": "alias",
-  "label.job-responsibility": "job responsibility",
-  "label.job-position": "job position",
-  "label.retired-at": "retired at",
+  "label.alias": "別名",
+  "label.job-responsibility": "職務責任",
+  "label.job-position": "役職",
+  "label.retired-at": "退職日時",
+  "prompt.sure to empty approval line ?": "承認ラインを空にしますか？",
   "title.approval-line editor": "決裁ライン編集",
   "title.approval-line item list": "決裁ライン詳細",
   "title.approval-line template list": "決裁ライン テンプレート リスト",

package/translations/ko.json

@@ -3,6 +3,7 @@
   "button.add-sibling-dept": "동급부서",
   "button.copy from": "복사해오기",
   "button.detach": "연결해제",
+  "button.edit-contact": "연락처 편집",
   "button.edit-detail": "상세 편집",
   "field.approver": "결재자",
   "field.control-no": "관리 번호",
@@ -28,6 +29,7 @@
   "label.job-responsibility": "직책",
   "label.job-position": "직급",
   "label.retired-at": "퇴사일",
+  "prompt.sure to empty approval line ?": "결재라인을 비우시겠습니까 ?",
   "title.approval-line editor": "결재라인 편집",
   "title.approval-line item list": "결재라인 상세",
   "title.approval-line template list": "결재라인 템플릿 목록",

package/translations/ms.json

@@ -3,6 +3,7 @@
   "button.add-sibling-dept": "tambah jabatan sejawat",
   "button.copy from": "salin dari",
   "button.detach": "lepaskan",
+  "button.edit-contact": "edit kenalan",
   "button.edit-detail": "edit butiran",
   "field.approver": "penyetuju",
   "field.control-no": "nombor kawalan",
@@ -25,9 +26,10 @@
   "label.note": "catatan",
   "label.picture": "gambar",
   "label.alias": "alias",
-  "label.job-responsibility": "job responsibility",
-  "label.job-position": "job position",
-  "label.retired-at": "retired at",
+  "label.job-responsibility": "tanggungjawab kerja",
+  "label.job-position": "jawatan kerja",
+  "label.retired-at": "bersara pada",
+  "prompt.sure to empty approval line ?": "pasti mahu kosongkan garis kelulusan?",
   "title.approval-line editor": "editor garis kelulusan",
   "title.approval-line item list": "senarai item garis kelulusan",
   "title.approval-line template list": "senarai templat garis kelulusan",

package/translations/zh.json

@@ -3,6 +3,7 @@
   "button.add-sibling-dept": "添加同级部门",
   "button.copy from": "复制自",
   "button.detach": "分离",
+  "button.edit-contact": "编辑联系人",
   "button.edit-detail": "编辑详情",
   "field.approver": "审批人",
   "field.control-no": "控制编号",
@@ -24,10 +25,11 @@
   "label.myself": "我",
   "label.note": "备注",
   "label.picture": "照片",
-  "label.alias": "alias",
-  "label.job-responsibility": "job responsibility",
-  "label.job-position": "job position",
-  "label.retired-at": "retired at",
+  "label.alias": "别名",
+  "label.job-responsibility": "工作职责",
+  "label.job-position": "职位",
+  "label.retired-at": "退休时间",
+  "prompt.sure to empty approval line ?": "确定要清空审批行吗？",
   "title.approval-line editor": "审批线编辑器",
   "title.approval-line item list": "审批线项目列表",
   "title.approval-line template list": "审批线模板列表",