@things-factory/organization 6.1.84 → 6.1.87

package/client/component/department-view.ts

@@ -6,6 +6,7 @@ import { customElement, property, query, state } from 'lit/decorators.js'
 import { ScopedElementsMixin } from '@open-wc/scoped-elements'
 import { i18next, localize } from '@operato/i18n'
 import { ScrollbarStyles } from '@operato/styles'
+import { getCodeByName } from '@things-factory/code-base'
 
 @customElement('department-view')
 export class DepartmentView extends localize(i18next)(ScopedElementsMixin(LitElement)) {
@@ -72,14 +73,14 @@ export class DepartmentView extends localize(i18next)(ScopedElementsMixin(LitEle
         name: 'active',
         label: 'active'
       },
-      {
+      /*{
         type: 'select',
         name: 'state',
         label: 'state',
         property: {
-          options: ['', 'STATUS_A', 'STATUS_B']
+          options: ['', 'STATUS_A', 'STATUS_B']   
         }
-      },
+      },*/
       {
         type: 'image',
         name: 'picture',

package/client/pages/employee/employee-list-page.ts

@@ -124,6 +124,7 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
 
   async pageInitialized(lifecycle: any) {
     this.gristConfig = {
+      pagination: { pages : [50, 100, 200] },
       list: {
         thumbnail: 'profile',
         fields: ['controlNo', 'name'],
@@ -157,7 +158,7 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 105
         },
         {
           type: 'string',
@@ -168,7 +169,18 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
           },
           filter: 'search',
           sortable: true,
-          width: 150
+          width: 100
+        },
+        {
+          type: 'string',
+          name: 'alias',
+          header: i18next.t('label.alias'),
+          record: {
+            editable: true
+          },
+          filter: 'search',
+          sortable: true,
+          width: 110
         },
         {
           type: 'resource-object',
@@ -190,23 +202,20 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
             }
           },
           sortable: true,
-          width: 200
+          filter: false,
+          width: 100
         },
         {
-          type: 'select',
+          type: 'code',
           name: 'type',
           header: i18next.t('field.type'),
-          record: {
-            editable: true,
-            options: [
-              { display: '', value: '' },
-              { display: '정규직', value: 'FULLTIME' },
-              { display: '시간제 정규직', value: 'PARTTIME' },
-              { display: '파견직', value: 'TEMPORARY' }
-            ]
-          },
-          filter: 'search',
-          width: 200
+          width: 115,
+          sortable: false,
+          filter: false,
+          record: { 
+            editable: true, 
+            codeName: 'EMPLOYEE_TYPE' 
+          }
         },
         {
           type: 'department-object',
@@ -216,7 +225,8 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
             editable: true
           },
           sortable: true,
-          width: 200
+          filter: false,
+          width: 130
         },
         {
           type: 'resource-object',
@@ -227,86 +237,141 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
             options: {
               title: i18next.t('title.employee list'),
               queryName: 'employees',
-              columns: [
+              pagination: { pages : [100, 200, 500] },
+              basicArgs: {
+                filters: [{ 
+                  name: 'active', operator: 'eq', value: true 
+                }]
+              },
+              list: { fields: ['controlNo', 'name', 'alias', 'hiredOn', 'active'] },
+              select: [
                 { name: 'id', hidden: true },
-                { name: 'controlNo', header: { renderer: () => i18next.t('field.control-no') }, filter: 'search' },
-                { name: 'name', header: { renderer: () => i18next.t('field.name') }, filter: 'search' },
-                { name: 'email', header: { renderer: () => i18next.t('field.email') } }
+                { type: 'string', name: 'controlNo', header: { renderer: () => i18next.t('field.control-no') }, width: 130, filter: 'search', sortable: true },
+                { type: 'string', name: 'name', header: { renderer: () => i18next.t('field.name') }, width: 150, filter: 'search' },
+                { type: 'string', name: 'alias', header: { renderer: () => i18next.t('label.alias') }, width: 150, filter: 'search' },
+                { type: 'string', name: 'hiredOn', header: { renderer: () => i18next.t('field.hired-on'), width: 100 } },
+                {
+                  type: 'checkbox',
+                  name: 'active',
+                  label: true,
+                  header: i18next.t('field.active'),
+                  record: {
+                    align: 'center',
+                    editable: true
+                  },
+                  sortable: true,
+                  width: 85
+                }
               ],
-              list: { fields: ['control-no', 'name', 'email'] },
               valueField: 'id',
               nameField: 'name',
               descriptionField: 'controlNo'
             }
           },
           sortable: true,
-          width: 200
+          width: 120
         },
         {
           type: 'string',
           name: 'email',
           header: i18next.t('field.email'),
+          width: 200,
           record: {
-            editable: false
+            editable: false,
+            renderer: function (value, column, record, rowIndex, field) {
+              return record.contact ? record.contact.email : ''
+            }
           },
-          sortable: true,
-          width: 200
+          sortable: true
         },
         {
           type: 'string',
           name: 'phone',
           header: i18next.t('field.phone'),
+          width: 110,
           record: {
-            editable: false
+            editable: false,
+            renderer: function (value, column, record, rowIndex, field) {
+              return record.contact ? record.contact.phone : ''
+            }
           },
-          sortable: true,
-          width: 200
+          sortable: true
+        },
+        {
+          type: 'code',
+          name: 'jobResponsibility',
+          header: i18next.t('label.job-responsibility'),
+          width: 100,
+          record: { 
+            editable: true, 
+            codeName: 'JOB_RESPONSIBILITY' 
+          }
+        },
+        {
+          type: 'code',
+          name: 'jobPosition',
+          header: i18next.t('label.job-position'),
+          width: 100,
+          record: {
+            editable: true,
+            codeName: 'JOB_POSITION' 
+          }
+        },
+        {
+          type: 'date',
+          name: 'hiredOn',
+          header: i18next.t('field.hired-on'),
+          width: 100,
+          record: {
+            editable: true
+          },
+          sortable: true
+        },
+        {
+          type: 'date',
+          name: 'retiredAt',
+          header: i18next.t('label.retired-at'),
+          width: 100,
+          record: {
+            editable: true
+          }
         },
         {
           type: 'checkbox',
           name: 'active',
           label: true,
           header: i18next.t('field.active'),
+          width: 85,
           record: {
+            align: 'center',
             editable: true
           },
           filter: true,
-          sortable: true,
-          width: 60
+          sortable: true
         },
         {
           type: 'string',
           name: 'note',
           header: i18next.t('field.note'),
+          width: 200,
           record: {
             editable: true
           },
-          filter: 'search',
-          width: 200
-        },
-        {
-          type: 'date',
-          name: 'hiredOn',
-          header: i18next.t('field.hired-on'),
-          record: {
-            editable: true
-          },
-          sortable: true,
-          width: 150
+          filter: 'search'
         },
         {
           type: 'resource-object',
           name: 'updater',
           header: i18next.t('field.updater'),
-          sortable: true,
-          width: 120
+          width: 90,
+          sortable: false
         },
         {
           type: 'datetime',
           name: 'updatedAt',
           header: i18next.t('field.updated_at'),
-          sortable: true,
-          width: 180
+          width: 180,
+          sortable: true
         },
         {
           type: 'image',
@@ -330,7 +395,7 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
       },
       sorters: [
         {
-          name: 'name'
+          name: 'controlNo'
         }
       ]
     }
@@ -351,9 +416,13 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
               id
               controlNo
               name
+              alias
               type
+              jobResponsibility
+              jobPosition
               active
               email
+              phone
               user {
                 id
                 name
@@ -368,11 +437,14 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
                 name
                 controlNo
               }
-              phone
               note
               hiredOn
+              retiredAt
               contact {
                 id
+                email
+                phone
+                address
               }
               profile {
                 left
@@ -465,7 +537,7 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
 
   async exportHandler() {
     const exportTargets = this.grist.selected.length ? this.grist.selected : this.grist.dirtyData.records
-    const targetFieldSet = new Set(['id', 'controlNo', 'name', 'email', 'department', 'hiredOn'])
+    const targetFieldSet = new Set(['id', 'controlNo', 'name', 'alias', 'type', 'hiredOn', 'retiredAt', 'active', 'note'])
 
     return exportTargets.map(employee => {
       let tempObj = {}
@@ -512,10 +584,10 @@ export class EmployeeListPage extends connect(store)(localize(i18next)(ScopedEle
             id
             name
             company
+            department
             email
             phone
             address
-            department
             note
             items {
               type