@things-factory/worklist 7.0.1-alpha.4 → 7.0.1-alpha.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/bootstrap.ts +3 -3
- package/client/components/activity-/bowner-view.ts +1 -1
- package/client/components/activity-approval-ribon.ts +6 -15
- package/client/components/activity-instance-preview.ts +5 -18
- package/client/components/activity-instance-ribon.ts +6 -9
- package/client/components/activity-intro-view.ts +1 -1
- package/client/components/activity-reporter-view.ts +1 -1
- package/client/components/activity-starter-form.ts +4 -5
- package/client/components/activity-thread-ribon.ts +6 -9
- package/client/components/activity-thread-timeline.ts +4 -4
- package/client/grist-editor/grist-editor-activity-search-key.ts +2 -7
- package/client/grist-editor/grist-renderer-activity-search-key.ts +2 -7
- package/client/grist-editor/popup-activity-search-keys-input.ts +5 -14
- package/client/pages/activity/activity-list-page.ts +9 -12
- package/client/pages/activity/activity-model-item-list.ts +26 -31
- package/client/pages/activity-approval/activity-approval-importer.ts +7 -18
- package/client/pages/activity-approval/activity-approval-list-page.ts +5 -5
- package/client/pages/activity-instance/activity-instance-list-page.ts +6 -6
- package/client/pages/activity-instance/activity-instance-search-page.ts +13 -28
- package/client/pages/activity-instance/activity-instance-view.ts +8 -8
- package/client/pages/activity-stats/activity-stats-importer.ts +7 -18
- package/client/pages/activity-stats/activity-stats-list-page.ts +5 -5
- package/client/pages/activity-store/activity-store-page.ts +8 -11
- package/client/pages/activity-supervisor/reporter-list-page.ts +11 -14
- package/client/pages/activity-template/activity-template-importer.ts +20 -29
- package/client/pages/activity-template/activity-template-list-page.ts +11 -14
- package/client/pages/activity-thread/activity-thread-importer.ts +22 -34
- package/client/pages/activity-thread/activity-thread-list-page.ts +5 -5
- package/client/pages/activity-thread/activity-thread-view.ts +2 -2
- package/client/pages/installable-activity/installable-activity-list-page.ts +8 -16
- package/client/pages/todo/approval-done-list-page.ts +2 -5
- package/client/pages/todo/approval-pending-list-page.ts +2 -5
- package/client/pages/todo/done-list-calendar-page.ts +3 -6
- package/client/pages/todo/done-list-page.ts +2 -5
- package/client/pages/todo/draft-list-page.ts +5 -5
- package/client/pages/todo/pickable-list-page.ts +1 -4
- package/client/pages/todo/todo-list-page.ts +2 -5
- package/client/templates/activity-approval-context-template.ts +1 -1
- package/client/templates/activity-instance-context-template.ts +9 -4
- package/client/templates/activity-thread-context-template.ts +1 -1
- package/dist-client/bootstrap.d.ts +1 -1
- package/dist-client/bootstrap.js +3 -3
- package/dist-client/bootstrap.js.map +1 -1
- package/dist-client/components/activity-/bowner-view.d.ts +1 -1
- package/dist-client/components/activity-/bowner-view.js +1 -1
- package/dist-client/components/activity-/bowner-view.js.map +1 -1
- package/dist-client/components/activity-approval-ribon.d.ts +0 -1
- package/dist-client/components/activity-approval-ribon.js +6 -15
- package/dist-client/components/activity-approval-ribon.js.map +1 -1
- package/dist-client/components/activity-instance-preview.d.ts +1 -1
- package/dist-client/components/activity-instance-preview.js +4 -8
- package/dist-client/components/activity-instance-preview.js.map +1 -1
- package/dist-client/components/activity-instance-ribon.d.ts +1 -1
- package/dist-client/components/activity-instance-ribon.js +6 -9
- package/dist-client/components/activity-instance-ribon.js.map +1 -1
- package/dist-client/components/activity-intro-view.d.ts +1 -1
- package/dist-client/components/activity-intro-view.js +1 -1
- package/dist-client/components/activity-intro-view.js.map +1 -1
- package/dist-client/components/activity-reporter-view.d.ts +1 -1
- package/dist-client/components/activity-reporter-view.js +1 -1
- package/dist-client/components/activity-reporter-view.js.map +1 -1
- package/dist-client/components/activity-starter-form.d.ts +1 -2
- package/dist-client/components/activity-starter-form.js +4 -5
- package/dist-client/components/activity-starter-form.js.map +1 -1
- package/dist-client/components/activity-thread-ribon.d.ts +1 -1
- package/dist-client/components/activity-thread-ribon.js +6 -9
- package/dist-client/components/activity-thread-ribon.js.map +1 -1
- package/dist-client/components/activity-thread-timeline.d.ts +1 -1
- package/dist-client/components/activity-thread-timeline.js +4 -4
- package/dist-client/components/activity-thread-timeline.js.map +1 -1
- package/dist-client/grist-editor/grist-editor-activity-search-key.js +2 -7
- package/dist-client/grist-editor/grist-editor-activity-search-key.js.map +1 -1
- package/dist-client/grist-editor/grist-renderer-activity-search-key.d.ts +1 -1
- package/dist-client/grist-editor/grist-renderer-activity-search-key.js +2 -7
- package/dist-client/grist-editor/grist-renderer-activity-search-key.js.map +1 -1
- package/dist-client/grist-editor/popup-activity-search-keys-input.js +5 -14
- package/dist-client/grist-editor/popup-activity-search-keys-input.js.map +1 -1
- package/dist-client/pages/activity/activity-list-page.js +3 -3
- package/dist-client/pages/activity/activity-list-page.js.map +1 -1
- package/dist-client/pages/activity/activity-model-item-list.js +23 -27
- package/dist-client/pages/activity/activity-model-item-list.js.map +1 -1
- package/dist-client/pages/activity-approval/activity-approval-importer.d.ts +1 -0
- package/dist-client/pages/activity-approval/activity-approval-importer.js +4 -11
- package/dist-client/pages/activity-approval/activity-approval-importer.js.map +1 -1
- package/dist-client/pages/activity-approval/activity-approval-list-page.js +5 -5
- package/dist-client/pages/activity-approval/activity-approval-list-page.js.map +1 -1
- package/dist-client/pages/activity-instance/activity-instance-list-page.js +6 -6
- package/dist-client/pages/activity-instance/activity-instance-list-page.js.map +1 -1
- package/dist-client/pages/activity-instance/activity-instance-search-page.js +8 -20
- package/dist-client/pages/activity-instance/activity-instance-search-page.js.map +1 -1
- package/dist-client/pages/activity-instance/activity-instance-view.js +8 -8
- package/dist-client/pages/activity-instance/activity-instance-view.js.map +1 -1
- package/dist-client/pages/activity-stats/activity-stats-importer.d.ts +1 -0
- package/dist-client/pages/activity-stats/activity-stats-importer.js +4 -11
- package/dist-client/pages/activity-stats/activity-stats-importer.js.map +1 -1
- package/dist-client/pages/activity-stats/activity-stats-list-page.js +5 -5
- package/dist-client/pages/activity-stats/activity-stats-list-page.js.map +1 -1
- package/dist-client/pages/activity-store/activity-store-page.js +2 -2
- package/dist-client/pages/activity-store/activity-store-page.js.map +1 -1
- package/dist-client/pages/activity-supervisor/reporter-list-page.js +5 -5
- package/dist-client/pages/activity-supervisor/reporter-list-page.js.map +1 -1
- package/dist-client/pages/activity-template/activity-template-importer.d.ts +1 -0
- package/dist-client/pages/activity-template/activity-template-importer.js +13 -20
- package/dist-client/pages/activity-template/activity-template-importer.js.map +1 -1
- package/dist-client/pages/activity-template/activity-template-list-page.js +5 -5
- package/dist-client/pages/activity-template/activity-template-list-page.js.map +1 -1
- package/dist-client/pages/activity-thread/activity-thread-importer.d.ts +1 -0
- package/dist-client/pages/activity-thread/activity-thread-importer.js +15 -24
- package/dist-client/pages/activity-thread/activity-thread-importer.js.map +1 -1
- package/dist-client/pages/activity-thread/activity-thread-list-page.js +5 -5
- package/dist-client/pages/activity-thread/activity-thread-list-page.js.map +1 -1
- package/dist-client/pages/activity-thread/activity-thread-view.js +2 -2
- package/dist-client/pages/activity-thread/activity-thread-view.js.map +1 -1
- package/dist-client/pages/installable-activity/installable-activity-list-page.js +3 -8
- package/dist-client/pages/installable-activity/installable-activity-list-page.js.map +1 -1
- package/dist-client/pages/todo/approval-done-list-page.js +2 -5
- package/dist-client/pages/todo/approval-done-list-page.js.map +1 -1
- package/dist-client/pages/todo/approval-pending-list-page.js +2 -5
- package/dist-client/pages/todo/approval-pending-list-page.js.map +1 -1
- package/dist-client/pages/todo/done-list-calendar-page.d.ts +1 -1
- package/dist-client/pages/todo/done-list-calendar-page.js +3 -5
- package/dist-client/pages/todo/done-list-calendar-page.js.map +1 -1
- package/dist-client/pages/todo/done-list-page.js +2 -5
- package/dist-client/pages/todo/done-list-page.js.map +1 -1
- package/dist-client/pages/todo/draft-list-page.js +5 -5
- package/dist-client/pages/todo/draft-list-page.js.map +1 -1
- package/dist-client/pages/todo/pickable-list-page.js +1 -4
- package/dist-client/pages/todo/pickable-list-page.js.map +1 -1
- package/dist-client/pages/todo/todo-list-page.js +2 -5
- package/dist-client/pages/todo/todo-list-page.js.map +1 -1
- package/dist-client/route.d.ts +1 -1
- package/dist-client/templates/activity-approval-context-template.d.ts +1 -1
- package/dist-client/templates/activity-approval-context-template.js +1 -1
- package/dist-client/templates/activity-approval-context-template.js.map +1 -1
- package/dist-client/templates/activity-instance-context-template.d.ts +2 -1
- package/dist-client/templates/activity-instance-context-template.js +9 -4
- package/dist-client/templates/activity-instance-context-template.js.map +1 -1
- package/dist-client/templates/activity-thread-context-template.d.ts +1 -1
- package/dist-client/templates/activity-thread-context-template.js +1 -1
- package/dist-client/templates/activity-thread-context-template.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +10 -9
package/client/bootstrap.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/icon/icon.js'
|
|
2
2
|
import './templates/activity-approval-context-template.js'
|
|
3
3
|
import './templates/activity-thread-context-template.js'
|
|
4
4
|
import './templates/activity-instance-context-template.js'
|
|
@@ -46,13 +46,13 @@ export default function bootstrap() {
|
|
|
46
46
|
tool: {
|
|
47
47
|
position: TOOL_POSITION.FRONT,
|
|
48
48
|
template: html`
|
|
49
|
-
<
|
|
49
|
+
<md-icon
|
|
50
50
|
@click=${async e => {
|
|
51
51
|
openOverlay('context-toolbar-overlay', {
|
|
52
52
|
template
|
|
53
53
|
})
|
|
54
54
|
}}
|
|
55
|
-
>info</
|
|
55
|
+
>info</md-icon
|
|
56
56
|
>
|
|
57
57
|
`,
|
|
58
58
|
context
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import '@material/mwc-button'
|
|
2
1
|
import '@operato/property-editor/ox-properties-dynamic-view.js'
|
|
3
2
|
import '@things-factory/organization/dist-client/component/approval-line-brief.js'
|
|
4
3
|
import '../templates/activity-approval-context-template.js'
|
|
@@ -60,7 +59,7 @@ export class ActivityApprovalRibon extends localize(i18next)(LitElement) {
|
|
|
60
59
|
--worklist-status-color: #cb3a33;
|
|
61
60
|
}
|
|
62
61
|
|
|
63
|
-
|
|
62
|
+
md-icon {
|
|
64
63
|
font-size: 24px;
|
|
65
64
|
}
|
|
66
65
|
|
|
@@ -103,7 +102,7 @@ export class ActivityApprovalRibon extends localize(i18next)(LitElement) {
|
|
|
103
102
|
[assignee] {
|
|
104
103
|
display: none;
|
|
105
104
|
}
|
|
106
|
-
|
|
105
|
+
md-icon {
|
|
107
106
|
padding: 0;
|
|
108
107
|
}
|
|
109
108
|
approval-line-brief {
|
|
@@ -122,16 +121,13 @@ export class ActivityApprovalRibon extends localize(i18next)(LitElement) {
|
|
|
122
121
|
|
|
123
122
|
return html`
|
|
124
123
|
<div desc>
|
|
125
|
-
<
|
|
124
|
+
<md-icon
|
|
126
125
|
@click=${() => {
|
|
127
126
|
toggleOverlay('activity-info-overlay', {
|
|
128
|
-
template: html`<activity-approval-context-template
|
|
129
|
-
.activityApproval=${this.activityApproval}
|
|
130
|
-
state=${state}
|
|
131
|
-
></activity-approval-context-template>`
|
|
127
|
+
template: html`<activity-approval-context-template .activityApproval=${this.activityApproval} state=${state}></activity-approval-context-template>`
|
|
132
128
|
})
|
|
133
129
|
}}
|
|
134
|
-
>description</
|
|
130
|
+
>description</md-icon
|
|
135
131
|
>
|
|
136
132
|
${description}
|
|
137
133
|
</div>
|
|
@@ -143,12 +139,7 @@ export class ActivityApprovalRibon extends localize(i18next)(LitElement) {
|
|
|
143
139
|
</div>
|
|
144
140
|
`
|
|
145
141
|
: html``}
|
|
146
|
-
${approvalLine
|
|
147
|
-
? html`<approval-line-brief
|
|
148
|
-
.model=${approvalLine}
|
|
149
|
-
.current=${this.activityApproval.order}
|
|
150
|
-
></approval-line-brief>`
|
|
151
|
-
: html``}
|
|
142
|
+
${approvalLine ? html`<approval-line-brief .model=${approvalLine} .current=${this.activityApproval.order}></approval-line-brief>` : html``}
|
|
152
143
|
|
|
153
144
|
<div state>${i18next.t('label.activity-state-' + state)}</div>
|
|
154
145
|
`
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/button/elevated-button.js'
|
|
2
2
|
import '@operato/property-editor/ox-properties-dynamic-view.js'
|
|
3
3
|
|
|
4
4
|
import gql from 'graphql-tag'
|
|
@@ -45,7 +45,7 @@ class ActivityInstancePreview extends localize(i18next)(LitElement) {
|
|
|
45
45
|
padding: var(--padding-default);
|
|
46
46
|
}
|
|
47
47
|
|
|
48
|
-
|
|
48
|
+
md-elevated-button {
|
|
49
49
|
margin-left: var(--margin-default);
|
|
50
50
|
}
|
|
51
51
|
`
|
|
@@ -58,16 +58,7 @@ class ActivityInstancePreview extends localize(i18next)(LitElement) {
|
|
|
58
58
|
@state() picked: boolean = false
|
|
59
59
|
|
|
60
60
|
render() {
|
|
61
|
-
const {
|
|
62
|
-
id,
|
|
63
|
-
name,
|
|
64
|
-
description,
|
|
65
|
-
input,
|
|
66
|
-
state,
|
|
67
|
-
threadsMin = 0,
|
|
68
|
-
threadsMax = 0,
|
|
69
|
-
activity
|
|
70
|
-
} = this.activityInstance || {}
|
|
61
|
+
const { id, name, description, input, state, threadsMin = 0, threadsMax = 0, activity } = this.activityInstance || {}
|
|
71
62
|
const { model, thumbnail } = activity || {}
|
|
72
63
|
|
|
73
64
|
const inputSpec = (model || [])
|
|
@@ -107,12 +98,8 @@ class ActivityInstancePreview extends localize(i18next)(LitElement) {
|
|
|
107
98
|
</content>
|
|
108
99
|
|
|
109
100
|
<div class="button-container">
|
|
110
|
-
<
|
|
111
|
-
${pickable
|
|
112
|
-
? html`<mwc-button raised @click=${this.pickActivityInstance.bind(this)}
|
|
113
|
-
>${i18next.t('button.pick')}</mwc-button
|
|
114
|
-
>`
|
|
115
|
-
: html``}
|
|
101
|
+
<md-elevated-button raised @click=${e => history.back()}>${i18next.t('button.close')}</md-elevated-button>
|
|
102
|
+
${pickable ? html`<md-elevated-button raised @click=${this.pickActivityInstance.bind(this)}>${i18next.t('button.pick')}</md-elevated-button>` : html``}
|
|
116
103
|
</div>
|
|
117
104
|
`
|
|
118
105
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/button/elevated-button.js'
|
|
2
2
|
import '@operato/property-editor/ox-properties-dynamic-view.js'
|
|
3
3
|
import '@things-factory/organization/dist-client/component/approval-line-brief.js'
|
|
4
4
|
import '../templates/activity-instance-context-template.js'
|
|
@@ -60,7 +60,7 @@ export class ActivityInstanceRibon extends localize(i18next)(LitElement) {
|
|
|
60
60
|
--worklist-status-color: #cb3a33;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
|
|
63
|
+
md-icon {
|
|
64
64
|
font-size: 24px;
|
|
65
65
|
}
|
|
66
66
|
|
|
@@ -103,7 +103,7 @@ export class ActivityInstanceRibon extends localize(i18next)(LitElement) {
|
|
|
103
103
|
[assignee] {
|
|
104
104
|
display: none;
|
|
105
105
|
}
|
|
106
|
-
|
|
106
|
+
md-icon {
|
|
107
107
|
padding: 0;
|
|
108
108
|
}
|
|
109
109
|
approval-line-brief {
|
|
@@ -121,16 +121,13 @@ export class ActivityInstanceRibon extends localize(i18next)(LitElement) {
|
|
|
121
121
|
|
|
122
122
|
return html`
|
|
123
123
|
<div desc>
|
|
124
|
-
<
|
|
124
|
+
<md-icon
|
|
125
125
|
@click=${() => {
|
|
126
126
|
toggleOverlay('activity-info-overlay', {
|
|
127
|
-
template: html`<activity-instance-context-template
|
|
128
|
-
.activityInstance=${this.activityInstance}
|
|
129
|
-
state=${state}
|
|
130
|
-
></activity-instance-context-template>`
|
|
127
|
+
template: html`<activity-instance-context-template .activityInstance=${this.activityInstance} state=${state}></activity-instance-context-template>`
|
|
131
128
|
})
|
|
132
129
|
}}
|
|
133
|
-
>description</
|
|
130
|
+
>description</md-icon
|
|
134
131
|
>
|
|
135
132
|
${description}
|
|
136
133
|
</div>
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/button/elevated-button.js'
|
|
2
2
|
import '@operato/property-editor/ox-properties-dynamic-view.js'
|
|
3
|
-
import '@material/mwc-button'
|
|
4
3
|
import '@things-factory/organization'
|
|
5
4
|
|
|
6
5
|
import gql from 'graphql-tag'
|
|
@@ -67,7 +66,7 @@ export class ActivityStarterForm extends localize(i18next)(LitElement) {
|
|
|
67
66
|
padding: var(--padding-default);
|
|
68
67
|
}
|
|
69
68
|
|
|
70
|
-
|
|
69
|
+
md-elevated-button {
|
|
71
70
|
margin-left: var(--margin-default);
|
|
72
71
|
}
|
|
73
72
|
`
|
|
@@ -112,8 +111,8 @@ export class ActivityStarterForm extends localize(i18next)(LitElement) {
|
|
|
112
111
|
</content>
|
|
113
112
|
|
|
114
113
|
<div class="button-container">
|
|
115
|
-
<
|
|
116
|
-
<
|
|
114
|
+
<md-elevated-button raised @click=${this.draftActivityInstance.bind(this)}>${i18next.t('button.draft')}</md-elevated-button>
|
|
115
|
+
<md-elevated-button raised @click=${e => history.back()}>${i18next.t('button.close')}</md-elevated-button>
|
|
117
116
|
</div>
|
|
118
117
|
`
|
|
119
118
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/button/elevated-button.js'
|
|
2
2
|
import '@operato/property-editor/ox-properties-dynamic-view.js'
|
|
3
3
|
import '@things-factory/organization/dist-client/component/approval-line-brief.js'
|
|
4
4
|
import '../templates/activity-thread-context-template.js'
|
|
@@ -60,7 +60,7 @@ export class ActivityThreadRibon extends localize(i18next)(LitElement) {
|
|
|
60
60
|
--worklist-status-color: #cb3a33;
|
|
61
61
|
}
|
|
62
62
|
|
|
63
|
-
|
|
63
|
+
md-icon {
|
|
64
64
|
font-size: 24px;
|
|
65
65
|
}
|
|
66
66
|
|
|
@@ -96,7 +96,7 @@ export class ActivityThreadRibon extends localize(i18next)(LitElement) {
|
|
|
96
96
|
[assignee] {
|
|
97
97
|
display: none;
|
|
98
98
|
}
|
|
99
|
-
|
|
99
|
+
md-icon {
|
|
100
100
|
padding: 0;
|
|
101
101
|
}
|
|
102
102
|
approval-line-brief {
|
|
@@ -115,16 +115,13 @@ export class ActivityThreadRibon extends localize(i18next)(LitElement) {
|
|
|
115
115
|
|
|
116
116
|
return html`
|
|
117
117
|
<div desc>
|
|
118
|
-
<
|
|
118
|
+
<md-icon
|
|
119
119
|
@click=${() => {
|
|
120
120
|
toggleOverlay('activity-info-overlay', {
|
|
121
|
-
template: html`<activity-thread-context-template
|
|
122
|
-
.activityThread=${this.activityThread}
|
|
123
|
-
state=${state}
|
|
124
|
-
></activity-thread-context-template>`
|
|
121
|
+
template: html`<activity-thread-context-template .activityThread=${this.activityThread} state=${state}></activity-thread-context-template>`
|
|
125
122
|
})
|
|
126
123
|
}}
|
|
127
|
-
>description</
|
|
124
|
+
>description</md-icon
|
|
128
125
|
>
|
|
129
126
|
${description}
|
|
130
127
|
</div>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/icon/icon.js'
|
|
2
2
|
import '@things-factory/organization/dist-client/component/approval-line-view.js'
|
|
3
3
|
|
|
4
4
|
import { html, css, LitElement, nothing } from 'lit'
|
|
@@ -53,7 +53,7 @@ export class ActivityThreadTimeline extends connect(store)(LitElement) {
|
|
|
53
53
|
opacity: 0.7;
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
|
|
56
|
+
md-icon {
|
|
57
57
|
position: relative;
|
|
58
58
|
top: 3px;
|
|
59
59
|
font-size: var(--fontsize-large);
|
|
@@ -163,7 +163,7 @@ export class ActivityThreadTimeline extends connect(store)(LitElement) {
|
|
|
163
163
|
|
|
164
164
|
<span info>
|
|
165
165
|
${i18next.t('label.activity-transaction-' + transaction)}
|
|
166
|
-
<div><
|
|
166
|
+
<div><md-icon>account_circle</md-icon>${name}</div>
|
|
167
167
|
<p>${reason ? reason : output ? this.renderOutput(output) : nothing}</p>
|
|
168
168
|
</span>
|
|
169
169
|
</li>
|
|
@@ -180,7 +180,7 @@ export class ActivityThreadTimeline extends connect(store)(LitElement) {
|
|
|
180
180
|
<span status></span>
|
|
181
181
|
<span info>
|
|
182
182
|
${i18next.t('label.activity-state-' + judgment)}
|
|
183
|
-
<div><
|
|
183
|
+
<div><md-icon>account_circle</md-icon>${name}</div>
|
|
184
184
|
<p>${comment}</p>
|
|
185
185
|
</span>
|
|
186
186
|
</li>
|
|
@@ -16,9 +16,7 @@ export class GristEditorActivitySearchKeys extends OxGristEditor {
|
|
|
16
16
|
private popup?: PopupHandle
|
|
17
17
|
|
|
18
18
|
get editorTemplate() {
|
|
19
|
-
return this.value && this.value instanceof Array && this.value.length > 0
|
|
20
|
-
? html`<mwc-icon style="--mdc-icon-size:1.3em">key</mwc-icon>`
|
|
21
|
-
: html``
|
|
19
|
+
return this.value && this.value instanceof Array && this.value.length > 0 ? html`<md-icon style="--mdc-icon-size:1.3em">key</md-icon>` : html``
|
|
22
20
|
}
|
|
23
21
|
|
|
24
22
|
_onclick(e: Event): void {
|
|
@@ -65,10 +63,7 @@ export class GristEditorActivitySearchKeys extends OxGristEditor {
|
|
|
65
63
|
만약, 템플릿 내부에서 이들 속성의 레퍼런스가 변화했다면, 원래 상태로 되돌아가는 현상이 발생하게 된다.
|
|
66
64
|
따라서, 가급적 이들 속성의 레퍼런스를 변화시키지 않는 것이 좋다.
|
|
67
65
|
*/
|
|
68
|
-
var template = html`
|
|
69
|
-
<popup-activity-search-keys-input .value=${this.value} .confirmCallback=${confirmCallback}>
|
|
70
|
-
</popup-activity-search-keys-input>
|
|
71
|
-
`
|
|
66
|
+
var template = html` <popup-activity-search-keys-input .value=${this.value} .confirmCallback=${confirmCallback}> </popup-activity-search-keys-input> `
|
|
72
67
|
|
|
73
68
|
this.popup = openPopup(template, {
|
|
74
69
|
backdrop: true,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import '@material/
|
|
1
|
+
import '@material/web/icon/icon.js'
|
|
2
2
|
import { html } from 'lit'
|
|
3
3
|
import { FieldRenderer } from '@operato/data-grist'
|
|
4
4
|
|
|
@@ -15,11 +15,6 @@ function onmouseout(e: MouseEvent) {
|
|
|
15
15
|
|
|
16
16
|
export const GristRendererActivitySearchKeys: FieldRenderer = (value, column, record, rowIndex, field) => {
|
|
17
17
|
return value && value instanceof Array && value.length > 0
|
|
18
|
-
? html`<
|
|
19
|
-
style="--mdc-icon-size:1.3em"
|
|
20
|
-
@mouseover=${(e: MouseEvent) => onmouseover(e, value)}
|
|
21
|
-
@mouseout=${onmouseout}
|
|
22
|
-
>key</mwc-icon
|
|
23
|
-
>`
|
|
18
|
+
? html`<md-icon style="--mdc-icon-size:1.3em" @mouseover=${(e: MouseEvent) => onmouseover(e, value)} @mouseout=${onmouseout}>key</md-icon>`
|
|
24
19
|
: html``
|
|
25
20
|
}
|
|
@@ -3,7 +3,7 @@ import { customElement, property, query, state } from 'lit/decorators.js'
|
|
|
3
3
|
|
|
4
4
|
import { i18next } from '@operato/i18n'
|
|
5
5
|
import { closePopup } from '@operato/popup'
|
|
6
|
-
import { ScrollbarStyles } from '@operato/styles'
|
|
6
|
+
import { ButtonContainerStyles, ScrollbarStyles } from '@operato/styles'
|
|
7
7
|
import { isMobileDevice } from '@operato/utils'
|
|
8
8
|
import { getEditor, getRenderer, ColumnConfig, DataGrist, FetchOption, SortersControl } from '@operato/data-grist'
|
|
9
9
|
import { ActivitySearchKeyItem } from '../types/activity-search-key-item-type'
|
|
@@ -11,6 +11,7 @@ import { ActivitySearchKeyItem } from '../types/activity-search-key-item-type'
|
|
|
11
11
|
@customElement('popup-activity-search-keys-input')
|
|
12
12
|
export class PopupActivitySearchKeysInput extends LitElement {
|
|
13
13
|
static styles = [
|
|
14
|
+
ButtonContainerStyles,
|
|
14
15
|
ScrollbarStyles,
|
|
15
16
|
css`
|
|
16
17
|
:host {
|
|
@@ -26,12 +27,6 @@ export class PopupActivitySearchKeysInput extends LitElement {
|
|
|
26
27
|
ox-grist {
|
|
27
28
|
flex: 1;
|
|
28
29
|
}
|
|
29
|
-
|
|
30
|
-
.button-container {
|
|
31
|
-
display: flex;
|
|
32
|
-
margin-left: auto;
|
|
33
|
-
padding: var(--padding-default);
|
|
34
|
-
}
|
|
35
30
|
`
|
|
36
31
|
]
|
|
37
32
|
|
|
@@ -124,15 +119,11 @@ export class PopupActivitySearchKeysInput extends LitElement {
|
|
|
124
119
|
|
|
125
120
|
render() {
|
|
126
121
|
return html`
|
|
127
|
-
<ox-grist
|
|
128
|
-
.mode=${isMobileDevice() ? 'LIST' : 'GRID'}
|
|
129
|
-
.config=${this.gristConfig}
|
|
130
|
-
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
131
|
-
></ox-grist>
|
|
122
|
+
<ox-grist .mode=${isMobileDevice() ? 'LIST' : 'GRID'} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}></ox-grist>
|
|
132
123
|
|
|
133
124
|
<div class="button-container">
|
|
134
|
-
<
|
|
135
|
-
<
|
|
125
|
+
<button @click=${this.onCancel.bind(this)} danger><md-icon>cancel</md-icon>${i18next.t('button.cancel')}</button>
|
|
126
|
+
<button @click=${this.onConfirm.bind(this)}><md-icon>done</md-icon>${i18next.t('button.confirm')}</button>
|
|
136
127
|
</div>
|
|
137
128
|
`
|
|
138
129
|
}
|
|
@@ -111,8 +111,8 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
|
|
|
111
111
|
</div>
|
|
112
112
|
|
|
113
113
|
<div id="modes">
|
|
114
|
-
<
|
|
115
|
-
<
|
|
114
|
+
<md-icon @click=${() => (this.mode = 'GRID')} ?active=${mode == 'GRID'}>grid_on</md-icon>
|
|
115
|
+
<md-icon @click=${() => (this.mode = 'CARD')} ?active=${mode == 'CARD'}>apps</md-icon>
|
|
116
116
|
</div>
|
|
117
117
|
</div>
|
|
118
118
|
</ox-grist>
|
|
@@ -156,15 +156,12 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
|
|
|
156
156
|
handlers: {
|
|
157
157
|
click: (columns, data, column, record, rowIndex) => {
|
|
158
158
|
if (!record.id) return
|
|
159
|
-
const popup = openPopup(
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
title: i18next.t('title.activity model item list')
|
|
166
|
-
}
|
|
167
|
-
)
|
|
159
|
+
const popup = openPopup(html` <activity-model-item-list .activity=${record}></activity-model-item-list> `, {
|
|
160
|
+
backdrop: true,
|
|
161
|
+
help: 'worklist/activity/activity-model-item-list',
|
|
162
|
+
size: 'large',
|
|
163
|
+
title: i18next.t('title.activity model item list')
|
|
164
|
+
})
|
|
168
165
|
popup.onclosed = () => {
|
|
169
166
|
this.grist?.fetch()
|
|
170
167
|
}
|
|
@@ -272,7 +269,7 @@ export class ActivityListPage extends connect(store)(localize(i18next)(PageView)
|
|
|
272
269
|
renderer: function (value, column, record, rowIndex, field) {
|
|
273
270
|
const color = ['', '#98FB98', '#87CEEB', '#FF6B6B', '#8B0000'][value || 0]
|
|
274
271
|
const count = new Array(value > 4 ? 4 : value || 0).fill('')
|
|
275
|
-
return html`${count.map(() => html`<
|
|
272
|
+
return html`${count.map(() => html`<md-icon style="color:${color};">star</md-icon>`)}`
|
|
276
273
|
}
|
|
277
274
|
},
|
|
278
275
|
width: 75
|
|
@@ -7,52 +7,47 @@ import { i18next, localize } from '@operato/i18n'
|
|
|
7
7
|
import { OxPropertyEditor } from '@operato/property-editor'
|
|
8
8
|
import { isMobileDevice } from '@operato/utils'
|
|
9
9
|
|
|
10
|
-
|
|
11
10
|
@customElement('activity-model-item-list')
|
|
12
11
|
export class ActivityModelItemList extends localize(i18next)(LitElement) {
|
|
13
12
|
static styles = [
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
css`
|
|
14
|
+
:host {
|
|
15
|
+
display: flex;
|
|
16
|
+
flex-direction: column;
|
|
18
17
|
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
background-color: #fff;
|
|
19
|
+
}
|
|
21
20
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
21
|
+
ox-grist {
|
|
22
|
+
flex: 1;
|
|
23
|
+
}
|
|
25
24
|
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
25
|
+
.button-container {
|
|
26
|
+
display: flex;
|
|
27
|
+
margin-left: auto;
|
|
28
|
+
padding: var(--padding-default);
|
|
29
|
+
}
|
|
31
30
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
31
|
+
[danger] {
|
|
32
|
+
--mdc-theme-primary: var(--mdc-danger-button-primary-color);
|
|
33
|
+
}
|
|
34
|
+
md-elevated-button {
|
|
35
|
+
margin-left: var(--margin-default);
|
|
36
|
+
}
|
|
37
|
+
`
|
|
38
|
+
]
|
|
40
39
|
|
|
41
|
-
@property({ type: Object }) gristConfig?:any
|
|
40
|
+
@property({ type: Object }) gristConfig?: any
|
|
42
41
|
@property({ type: Object }) activity: any
|
|
43
42
|
|
|
44
43
|
@query('ox-grist') grist?: HTMLElement & { fetch: any; commit: any; deleteSelectedRecords: any; data: any }
|
|
45
44
|
|
|
46
45
|
render() {
|
|
47
46
|
return html`
|
|
48
|
-
<ox-grist
|
|
49
|
-
.mode=${isMobileDevice() ? 'CARD' : 'GRID'}
|
|
50
|
-
.config=${this.gristConfig}
|
|
51
|
-
.fetchHandler=${this.fetchHandler.bind(this)}
|
|
52
|
-
></ox-grist>
|
|
47
|
+
<ox-grist .mode=${isMobileDevice() ? 'CARD' : 'GRID'} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)}></ox-grist>
|
|
53
48
|
<div class="button-container">
|
|
54
|
-
<
|
|
55
|
-
<
|
|
49
|
+
<md-elevated-button raised danger @click=${this._deleteDataItems.bind(this)}>${i18next.t('button.delete')}</md-elevated-button>
|
|
50
|
+
<md-elevated-button raised @click=${this._updateDataItems.bind(this)}>${i18next.t('button.save')}</md-elevated-button>
|
|
56
51
|
</div>
|
|
57
52
|
`
|
|
58
53
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import '@material/web/icon/icon.js'
|
|
1
2
|
import '@operato/data-grist'
|
|
2
3
|
|
|
3
4
|
import gql from 'graphql-tag'
|
|
@@ -7,9 +8,11 @@ import { property } from 'lit/decorators.js'
|
|
|
7
8
|
import { client } from '@operato/graphql'
|
|
8
9
|
import { i18next } from '@operato/i18n'
|
|
9
10
|
import { isMobileDevice } from '@operato/utils'
|
|
11
|
+
import { ButtonContainerStyles } from '@operato/styles'
|
|
10
12
|
|
|
11
13
|
export class ActivityApprovalImporter extends LitElement {
|
|
12
14
|
static styles = [
|
|
15
|
+
ButtonContainerStyles,
|
|
13
16
|
css`
|
|
14
17
|
:host {
|
|
15
18
|
display: flex;
|
|
@@ -21,16 +24,6 @@ export class ActivityApprovalImporter extends LitElement {
|
|
|
21
24
|
ox-grist {
|
|
22
25
|
flex: 1;
|
|
23
26
|
}
|
|
24
|
-
|
|
25
|
-
.button-container {
|
|
26
|
-
display: flex;
|
|
27
|
-
margin-left: auto;
|
|
28
|
-
padding: var(--padding-default);
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
mwc-button {
|
|
32
|
-
margin-left: var(--margin-default);
|
|
33
|
-
}
|
|
34
27
|
`
|
|
35
28
|
]
|
|
36
29
|
|
|
@@ -60,21 +53,18 @@ export class ActivityApprovalImporter extends LitElement {
|
|
|
60
53
|
]
|
|
61
54
|
}
|
|
62
55
|
|
|
63
|
-
|
|
64
56
|
render() {
|
|
65
57
|
return html`
|
|
66
58
|
<ox-grist
|
|
67
59
|
.mode=${isMobileDevice() ? 'LIST' : 'GRID'}
|
|
68
60
|
.config=${this.columns}
|
|
69
|
-
.data=${
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
}
|
|
73
|
-
}
|
|
61
|
+
.data=${{
|
|
62
|
+
records: this.activityApprovals
|
|
63
|
+
}}
|
|
74
64
|
></ox-grist>
|
|
75
65
|
|
|
76
66
|
<div class="button-container">
|
|
77
|
-
<
|
|
67
|
+
<button @click=${this.save.bind(this)}><md-icon>save</md-icon>${i18next.t('button.save')}</button>
|
|
78
68
|
</div>
|
|
79
69
|
`
|
|
80
70
|
}
|
|
@@ -94,4 +84,3 @@ export class ActivityApprovalImporter extends LitElement {
|
|
|
94
84
|
this.dispatchEvent(new CustomEvent('imported'))
|
|
95
85
|
}
|
|
96
86
|
}
|
|
97
|
-
|
|
@@ -100,7 +100,7 @@ export class ActivityApprovalListPage extends connect(store)(localize(i18next)(S
|
|
|
100
100
|
|
|
101
101
|
<div id="sorters">
|
|
102
102
|
Sort
|
|
103
|
-
<
|
|
103
|
+
<md-icon
|
|
104
104
|
@click=${e => {
|
|
105
105
|
const target = e.currentTarget
|
|
106
106
|
this.sortersControl.open({
|
|
@@ -108,7 +108,7 @@ export class ActivityApprovalListPage extends connect(store)(localize(i18next)(S
|
|
|
108
108
|
top: target.offsetTop + target.offsetHeight
|
|
109
109
|
})
|
|
110
110
|
}}
|
|
111
|
-
>expand_more</
|
|
111
|
+
>expand_more</md-icon
|
|
112
112
|
>
|
|
113
113
|
<ox-popup id="sorter-control">
|
|
114
114
|
<ox-sorters-control> </ox-sorters-control>
|
|
@@ -116,9 +116,9 @@ export class ActivityApprovalListPage extends connect(store)(localize(i18next)(S
|
|
|
116
116
|
</div>
|
|
117
117
|
|
|
118
118
|
<div id="modes">
|
|
119
|
-
<
|
|
120
|
-
<
|
|
121
|
-
<
|
|
119
|
+
<md-icon @click=${() => (this.mode = 'GRID')} ?active=${mode == 'GRID'}>grid_on</md-icon>
|
|
120
|
+
<md-icon @click=${() => (this.mode = 'LIST')} ?active=${mode == 'LIST'}>format_list_bulleted</md-icon>
|
|
121
|
+
<md-icon @click=${() => (this.mode = 'CARD')} ?active=${mode == 'CARD'}>apps</md-icon>
|
|
122
122
|
</div>
|
|
123
123
|
</div>
|
|
124
124
|
</ox-grist>
|
|
@@ -71,7 +71,7 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
|
|
|
71
71
|
|
|
72
72
|
<div id="sorters">
|
|
73
73
|
Sort
|
|
74
|
-
<
|
|
74
|
+
<md-icon
|
|
75
75
|
@click=${(e: MouseEvent) => {
|
|
76
76
|
const target = e.currentTarget as HTMLElement
|
|
77
77
|
this.sorterControl.open({
|
|
@@ -79,7 +79,7 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
|
|
|
79
79
|
top: target.offsetTop + target.offsetHeight
|
|
80
80
|
})
|
|
81
81
|
}}
|
|
82
|
-
>expand_more</
|
|
82
|
+
>expand_more</md-icon
|
|
83
83
|
>
|
|
84
84
|
<ox-popup id="sorter-control">
|
|
85
85
|
<ox-sorters-control> </ox-sorters-control>
|
|
@@ -87,9 +87,9 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
|
|
|
87
87
|
</div>
|
|
88
88
|
|
|
89
89
|
<div id="modes">
|
|
90
|
-
<
|
|
91
|
-
<
|
|
92
|
-
<
|
|
90
|
+
<md-icon @click=${() => (this.mode = 'GRID')} ?active=${mode == 'GRID'}>grid_on</md-icon>
|
|
91
|
+
<md-icon @click=${() => (this.mode = 'LIST')} ?active=${mode == 'LIST'}>format_list_bulleted</md-icon>
|
|
92
|
+
<md-icon @click=${() => (this.mode = 'CARD')} ?active=${mode == 'CARD'}>apps</md-icon>
|
|
93
93
|
</div>
|
|
94
94
|
</div>
|
|
95
95
|
</ox-grist>
|
|
@@ -136,7 +136,7 @@ export class ActivityInstanceListPage extends connect(store)(localize(i18next)(P
|
|
|
136
136
|
renderer: function (value, column, record, rowIndex, field) {
|
|
137
137
|
const color = ['', '#98FB98', '#87CEEB', '#FF6B6B', '#8B0000'][value || 0]
|
|
138
138
|
const count = new Array(value > 4 ? 4 : value || 0).fill('')
|
|
139
|
-
return html`${count.map(() => html`<
|
|
139
|
+
return html`${count.map(() => html`<md-icon style="color:${color};">star</md-icon>`)}`
|
|
140
140
|
}
|
|
141
141
|
},
|
|
142
142
|
width: 60
|