@things-factory/worklist 6.0.43 → 6.0.46

package/client/pages/todo/approval-done-list-page.ts

@@ -0,0 +1,340 @@
+import '@operato/data-grist'
+import '@operato/input/ox-input-select-buttons.js'
+
+import gql from 'graphql-tag'
+import { css, html } from 'lit'
+import { customElement, property, query, state } from 'lit/decorators.js'
+import { connect } from 'pwa-helpers/connect-mixin.js'
+
+import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
+import { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import { navigate, PageView, store } from '@operato/shell'
+import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
+import { adjustFilters, isMobileDevice, sleep } from '@operato/utils'
+
+const MIN = 60
+const HOUR = 60 * MIN
+const DAY = 24 * HOUR
+
+@customElement('approval-done-list-page')
+export class ApprovalDoneListPage extends connect(store)(localize(i18next)(PageView)) {
+  static styles = [
+    ScrollbarStyles,
+    CommonGristStyles,
+    css`
+      :host {
+        display: flex;
+
+        width: 100%;
+
+        --grid-record-emphasized-background-color: red;
+        --grid-record-emphasized-color: yellow;
+      }
+
+      #modes {
+        margin-left: auto;
+      }
+    `
+  ]
+
+  @property({ type: Object }) gristConfig?: any
+  @property({ type: String }) mode: 'GRID' | 'LIST' | 'CARD' = isMobileDevice() ? 'CARD' : 'GRID'
+
+  @query('ox-grist') grist!: DataGrist
+
+  @state() filters?: string[]
+
+  get context() {
+    return {
+      search: {
+        handler: (search: string) => {
+          this.grist.searchText = search
+        },
+        placeholder: i18next.t('title.approval done list'),
+        value: this.grist.searchText
+      },
+      filter: {
+        handler: () => {
+          this.grist.toggleHeadroom()
+        }
+      },
+      help: 'worklist/worklist-concept',
+      actions: []
+    }
+  }
+
+  render() {
+    const mode = this.mode || (isMobileDevice() ? 'CARD' : 'GRID')
+
+    return html`
+      <ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}>
+        <div slot="headroom">
+          <div id="filters">
+            <ox-input-select-buttons
+              .value=${this.filters}
+              .options=${[
+                {
+                  display: i18next.t('label.filter-important'),
+                  value: 'important'
+                },
+                {
+                  display: i18next.t('label.filter-due'),
+                  value: 'due'
+                },
+                {
+                  display: i18next.t('label.filter-rejected'),
+                  value: 'rejected'
+                }
+              ]}
+              @change=${(e: CustomEvent) => {
+                this.filters = (e.currentTarget as any)?.value
+                this.grist.fetch()
+              }}
+            ></ox-input-select-buttons>
+          </div>
+
+          <div id="modes">
+            <mwc-icon @click=${() => (this.mode = 'GRID')} ?active=${mode == 'GRID'}>grid_on</mwc-icon>
+            <mwc-icon @click=${() => (this.mode = 'LIST')} ?active=${mode == 'LIST'}>format_list_bulleted</mwc-icon>
+            <mwc-icon @click=${() => (this.mode = 'CARD')} ?active=${mode == 'CARD'}>apps</mwc-icon>
+          </div>
+        </div>
+      </ox-grist>
+    `
+  }
+
+  async pageInitialized(lifecycle) {
+    this.gristConfig = {
+      list: {
+        thumbnail: 'thumbnail',
+        fields: ['name', 'description'],
+        details: ['createdAt', 'due']
+      },
+      columns: [
+        { type: 'gutter', gutterName: 'sequence' },
+        {
+          type: 'gutter',
+          gutterName: 'button',
+          name: 'start',
+          icon: 'play_arrow',
+          handlers: {
+            click: (columns, data, column, record, rowIndex) => {
+              const { id } = record
+              this.openActivityApproval(record)
+            }
+          }
+        },
+        {
+          type: 'string',
+          name: 'name',
+          header: i18next.t('field.name'),
+          record: {
+            editable: false
+          },
+          filter: 'search',
+          sortable: true,
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'description',
+          header: i18next.t('field.description'),
+          record: {
+            editable: false
+          },
+          filter: 'search',
+          width: 200
+        },
+        {
+          type: 'number',
+          name: 'round',
+          header: i18next.t('field.round'),
+          record: {
+            editable: false
+          },
+          width: 30
+        },
+        {
+          type: 'string',
+          name: 'viewSource',
+          header: i18next.t('field.view-source'),
+          record: {
+            editable: false,
+            renderer: function (value, column, record, rowIndex, field) {
+              const { viewType, viewSource } = record.activity || {}
+              var type = viewType !== 'board' ? 'string' : 'board'
+              return getRenderer(type)(viewSource, column, record, rowIndex, field)
+            }
+          },
+          width: 140,
+          hidden: true
+        },
+        {
+          type: 'number',
+          name: 'priority',
+          header: i18next.t('field.priority'),
+          record: {
+            editable: false,
+            renderer: function (value, column, record, rowIndex, field) {
+              const count = new Array(value > 4 ? 4 : value || 0).fill('')
+              return html`${count.map(() => html`<mwc-icon style="color:gray;">star</mwc-icon>`)}`
+            }
+          },
+          width: 60
+        },
+        {
+          type: 'select',
+          name: 'judgment',
+          header: i18next.t('field.judgment'),
+          record: {
+            editable: false,
+            options: [
+              { display: i18next.t('label.activity-state-rejected'), value: 'rejected' },
+              { display: i18next.t('label.activity-state-escalated'), value: 'escalated' },
+              { display: i18next.t('label.activity-state-delegated'), value: 'delegated' },
+              { display: i18next.t('label.activity-state-approved'), value: 'approved' },
+              { display: i18next.t('label.activity-state-aborted'), value: 'aborted' }
+            ]
+          },
+          width: 80
+        },
+        {
+          type: 'string',
+          name: 'comment',
+          header: i18next.t('field.comment'),
+          record: {
+            editable: false
+          },
+          width: 160
+        },
+        {
+          type: 'datetime',
+          name: 'createdAt',
+          header: i18next.t('field.created-at'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          filter: false,
+          width: 180
+        },
+        {
+          type: 'datetime',
+          name: 'terminatedAt',
+          header: i18next.t('field.terminated-at'),
+          record: {
+            editable: false
+          },
+          sortable: true,
+          filter: false,
+          width: 180
+        },
+        {
+          type: 'image',
+          name: 'thumbnail',
+          header: i18next.t('field.thumbnail'),
+          record: { editable: false },
+          hidden: true
+        }
+      ],
+      rows: {
+        appendable: false
+      }
+      // sorters: [
+      //   {
+      //     name: 'dueAt',
+      //     desc: false
+      //   }
+      // ]
+    }
+  }
+
+  async pageUpdated(changes, lifecycle, changedBefore) {
+    if (this.active) {
+      this.grist?.fetch()
+    }
+  }
+
+  async fetchHandler({ page, limit, sortings = [], filters = [] }: FetchOption) {
+    if (this.filters?.includes('important')) {
+      filters = adjustFilters(filters, [{ name: 'priority', operator: 'gte', value: 2 }])
+    }
+
+    if (this.filters?.includes('due')) {
+      let tomorrow = new Date(Date.now() + 24 * 3600 * 1000).toISOString().replace('T', ' ')
+      filters = adjustFilters(filters, [{ name: 'dueAt', operator: 'lte', value: tomorrow }])
+    }
+
+    if (this.filters?.includes('rejected')) {
+      filters = adjustFilters(filters, [{ name: 'judgment', operator: 'eq', value: 'rejected' }])
+    }
+
+    const response = await client.query({
+      query: gql`
+        query ($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          responses: approvalDoneList(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              id
+              round
+              judgment
+              comment
+              createdAt
+              terminatedAt
+              activityThread {
+                activityInstance {
+                  activityId: id
+                  name
+                  description
+                  priority
+                  input
+                  refBy
+                  activityType
+                  viewType
+                  viewSource
+                  thumbnail
+                  updatedAt
+                  createdAt
+                  creator {
+                    id
+                    name
+                  }
+                }
+                state
+                output
+                dueAt
+                assignedAt
+              }
+            }
+            total
+          }
+        }
+      `,
+      variables: {
+        filters,
+        pagination: { page, limit },
+        sortings
+      }
+    })
+
+    return {
+      total: response.data.responses.total || 0,
+      records: (response.data.responses.items || []).map(item => {
+        let thread = item.activityThread
+        return {
+          id: item.id,
+          ...thread.activityInstance,
+          judgment: item.judgment,
+          comment: item.comment,
+          round: item.round,
+          createdAt: item.createdAt,
+          terminatedAt: item.terminatedAt
+        }
+      })
+    }
+  }
+
+  openActivityApproval(activityApproval) {
+    navigate(`activity-approval/${activityApproval.id}?title=${activityApproval.name}`)
+  }
+}

package/client/pages/todo/approval-pending-list-page.ts

@@ -60,7 +60,7 @@ export class ApprovalPendingListPage extends connect(store)(localize(i18next)(Pa
           this.grist.toggleHeadroom()
         }
       },
-      help: 'worklist/approval-pending-list',
+      help: 'worklist/worklist-concept',
       actions: []
     }
   }
@@ -229,7 +229,7 @@ export class ApprovalPendingListPage extends connect(store)(localize(i18next)(Pa
         {
           type: 'datetime',
           name: 'createdAt',
-          header: i18next.t('field.posted-at'),
+          header: i18next.t('field.issued-at'),
           record: {
             editable: false
           },

package/client/pages/todo/done-list-calendar-page.ts

@@ -0,0 +1,115 @@
+import '@material/mwc-icon'
+import '@operato/event-view/ox-event-view.js'
+
+import { PropertyValues, html, css } from 'lit'
+import gql from 'graphql-tag'
+import { customElement, property, query, state } from 'lit/decorators.js'
+import { connect } from 'pwa-helpers/connect-mixin.js'
+import { store, PageView } from '@operato/shell'
+import { client } from '@operato/graphql'
+import { i18next, localize } from '@operato/i18n'
+import { OxEventView } from '@operato/event-view'
+import { ScrollbarStyles } from '@operato/styles'
+import { BizEvent, CALENDAR } from '@operato/event-view/types.js'
+
+@customElement('done-list-calendar-page')
+export class DoneListCalendarPage extends connect(store)(PageView) {
+  static styles = [
+    ScrollbarStyles,
+    css`
+      :host {
+        display: flex;
+      }
+
+      ox-event-view {
+        flex: 1;
+        padding: 10px;
+        overflow: auto;
+      }
+    `
+  ]
+
+  @query('ox-event-view') eventView!: OxEventView
+
+  get context() {
+    return {
+      title: i18next.t('title.done list calendar'),
+      help: 'worklist/worklist-concept'
+    }
+  }
+
+  render() {
+    return html` <ox-event-view mode="monthly" .eventProvider=${this}></ox-event-view> `
+  }
+
+  async fetchEventsForCalendar(calendar: CALENDAR): Promise<Map<Date, BizEvent[]>> {
+    const from = calendar[0].date.toISOString().split('T').join(' ')
+    const to = calendar[calendar.length - 1].date.toISOString().split('T').join(' ')
+
+    const response = await client.query({
+      query: gql`
+        query ($from: String!, $to: String!) {
+          responses: activityEvents(from: $from, to: $to) {
+            id
+            name
+            type
+            state
+            priority
+            date
+          }
+        }
+      `,
+      variables: {
+        from,
+        to
+      }
+    })
+
+    const eventMap = new Map<Date, BizEvent[]>()
+
+    if (response.data) {
+      const activityEvents = response.data.responses
+
+      calendar.forEach(({ date }) => {
+        const localDateString = date.toLocaleDateString()
+
+        var events = activityEvents
+          .filter(({ date: activityDate }) => new Date(activityDate).toLocaleDateString() == localDateString)
+          .sort((a, b) => (a.date > b.date ? 1 : -1))
+          .map(({ id, name, priority, date, type, state }) => {
+            const color = ['black', 'darkgray', 'orange', 'red'][priority || 0]
+            const href =
+              type == 'activity-thread'
+                ? `activity-thread-view/${id}?title=${name}`
+                : `activity-approval/${id}?title=${name}`
+            const at = new Date(date).toLocaleTimeString([], {
+              hourCycle: 'h23',
+              hour: '2-digit',
+              minute: '2-digit'
+            })
+            const icon = type == 'activity-thread' ? 'done' : state == 'approved' ? 'done_all' : 'assignment_return'
+
+            return {
+              template: html`<a href=${href} style="color:${color};display:block;text-decoration:none;"
+                ><mwc-icon style="font-size:1em;">${icon}</mwc-icon>&nbsp;${at}&nbsp;${name}</a
+              >`
+            }
+          })
+
+        eventMap.set(date, events)
+      })
+    }
+
+    return eventMap
+  }
+
+  pageUpdated(changes: any, lifecycle: any, before: any) {
+    if (this.active) {
+      /*
+       * this page is activated
+       */
+    } else {
+      /* this page is deactivated */
+    }
+  }
+}

package/client/pages/todo/done-list-page.ts

@@ -167,9 +167,8 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
           record: {
             editable: false,
             renderer: function (value, column, record, rowIndex, field) {
-              const color = ['', 'gray', 'yellow', 'orange', 'red'][value || 0]
               const count = new Array(value > 4 ? 4 : value || 0).fill('')
-              return html`${count.map(() => html`<mwc-icon style="color:${color};">star</mwc-icon>`)}`
+              return html`${count.map(() => html`<mwc-icon style="color:gray;">star</mwc-icon>`)}`
             }
           },
           width: 60
@@ -242,7 +241,7 @@ export class DoneListPage extends connect(store)(localize(i18next)(PageView)) {
         {
           type: 'datetime',
           name: 'createdAt',
-          header: i18next.t('field.posted-at'),
+          header: i18next.t('field.issued-at'),
           record: {
             editable: false
           },

package/client/pages/todo/draft-list-page.ts

@@ -6,17 +6,15 @@ import { css, html } from 'lit'
 import { customElement, property, query } from 'lit/decorators.js'
 import { connect } from 'pwa-helpers/connect-mixin.js'
 
-import { DataGrist, FetchOption, getRenderer } from '@operato/data-grist'
+import { DataGrist, FetchOption } from '@operato/data-grist'
 import { client } from '@operato/graphql'
 import { i18next, localize } from '@operato/i18n'
-import { openPopup } from '@operato/layout'
-import { PageView, store } from '@operato/shell'
+import { navigate, PageView, store } from '@operato/shell'
 import { CommonGristStyles, ScrollbarStyles } from '@operato/styles'
 import { isMobileDevice } from '@operato/utils'
 import { OxPopup } from '@operato/popup'
 
-import { ActivityInstanceStatus } from '../../types/activity-instance'
-import { Priorities } from '../../types/types.js'
+import { ActivityStartingTypes } from '../../types/types.js'
 
 const MIN = 60
 const HOUR = 60 * MIN
@@ -121,23 +119,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
                 return
               }
 
-              const popup = openPopup(
-                html`
-                  <activity-starter-form
-                    .activityId=${record.activity?.id}
-                    .activityInstance=${record}
-                  ></activity-starter-form>
-                `,
-                {
-                  backdrop: true,
-                  help: 'worklist/activity-starter-form',
-                  size: 'large',
-                  title: i18next.t('title.activity starter')
-                }
-              )
-              popup.onclosed = () => {
-                this.grist?.fetch()
-              }
+              this.openActivityInstanceStart(record)
             }
           }
         },
@@ -160,36 +142,19 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
             editable: false
           },
           filter: 'search',
-          width: 200
+          width: 240
         },
         {
-          type: 'string',
-          name: 'uiSource',
-          header: i18next.t('field.ui-source'),
-          record: {
-            editable: false,
-            renderer: function (value, column, record, rowIndex, field) {
-              const { uiType, uiSource } = record.activity || {}
-              var type = uiType !== 'board' ? 'string' : 'board'
-              return getRenderer(type)(uiSource, column, record, rowIndex, field)
-            }
-          },
-          width: 140,
-          hidden: true
-        },
-        {
-          type: 'number',
-          name: 'priority',
-          header: i18next.t('field.priority'),
+          type: 'select',
+          name: 'startingType',
+          label: true,
+          header: i18next.t('field.starting-type'),
           record: {
             editable: false,
-            renderer: function (value, column, record, rowIndex, field) {
-              const color = ['', 'gray', 'yellow', 'orange', 'red'][value || 0]
-              const count = new Array(value > 4 ? 4 : value || 0).fill('')
-              return html`${count.map(() => html`<mwc-icon style="color:${color};">star</mwc-icon>`)}`
-            }
+            options: ActivityStartingTypes
           },
-          width: 60
+          sortable: true,
+          width: 80
         },
         {
           type: 'select',
@@ -213,58 +178,8 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
         },
         {
           type: 'datetime',
-          name: 'dueAt',
-          header: i18next.t('field.due-at'),
-          record: {
-            editable: false,
-            options: {
-              year: 'numeric',
-              month: 'numeric',
-              day: 'numeric'
-            }
-          },
-          sortable: true,
-          // filter: {
-          //   type: 'date',
-          //   operator: 'between'
-          // },
-          // filter: {
-          //   type: 'select',
-          //   operator: 'between',
-          //   options: (column, owner) => {
-          //     const now = Date.now()
-          //     return [
-          //       {
-          //         display: '1일 이내 처리',
-          //         value: [now, Date.now() + 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '2일 이내 처리',
-          //         value: [now, Date.now() + 2 * 60 * 60 * 3600 * 1000]
-          //       },
-          //       {
-          //         display: '3일 이내 처리',
-          //         value: [now, Date.now() + 3 * 60 * 60 * 3600 * 1000]
-          //       }
-          //     ]
-          //   }
-          // },
-          width: 100
-        },
-        {
-          type: 'resource-object',
-          name: 'creator',
-          header: i18next.t('field.issuer'),
-          record: {
-            editable: false
-          },
-          sortable: true,
-          width: 120
-        },
-        {
-          type: 'datetime',
-          name: 'createdAt',
-          header: i18next.t('field.posted-at'),
+          name: 'updatedAt',
+          header: i18next.t('field.updated-at'),
           record: {
             editable: false
           },
@@ -284,8 +199,8 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
       },
       sorters: [
         {
-          name: 'dueAt',
-          desc: false
+          name: 'updatedAt',
+          desc: true
         }
       ]
     }
@@ -313,6 +228,7 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
               refBy
               activity {
                 id
+                startingType
               }
               activityType
               assignees {
@@ -361,7 +277,15 @@ export class DraftListPage extends connect(store)(localize(i18next)(PageView)) {
 
     return {
       total: response.data.responses.total || 0,
-      records: response.data.responses.items || []
+      records:
+        response.data.responses.items.map(item => {
+          item['startingType'] = item.activity?.startingType
+          return item
+        }) || []
     }
   }
+
+  openActivityInstanceStart(activityInstance) {
+    navigate(`activity-instance-start/${activityInstance.id}?title=${activityInstance.name}`)
+  }
 }

package/client/pages/todo/pickable-list-page.ts

@@ -45,7 +45,7 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
         handler: (search: string) => {
           this.grist.searchText = search
         },
-        placeholder: i18next.t('title.activity bank'),
+        placeholder: i18next.t('title.activity shopping'),
         value: this.grist.searchText
       },
       filter: {
@@ -53,6 +53,7 @@ export class PickableListPage extends connect(store)(localize(i18next)(PageView)
           this.grist.toggleHeadroom()
         }
       },
+      help: 'worklist/activity-bank',
       actions: []
     }
   }