@things-factory/dataset 7.0.0-alpha.3 → 7.0.0-alpha.5
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/activities/activity-data-collect-edit.ts +1 -7
- package/client/activities/activity-data-review-edit.ts +0 -28
- package/client/activities/activity-data-review-view.ts +0 -28
- package/client/activities/activity-ooc-resolve-edit.ts +44 -48
- package/client/activities/activity-ooc-resolve-view.ts +16 -38
- package/client/activities/activity-ooc-review-edit.ts +36 -29
- package/client/activities/activity-ooc-review-view.ts +0 -22
- package/client/bootstrap.ts +5 -9
- package/dist-client/activities/activity-data-collect-edit.js +1 -7
- package/dist-client/activities/activity-data-collect-edit.js.map +1 -1
- package/dist-client/activities/activity-data-review-edit.js +0 -28
- package/dist-client/activities/activity-data-review-edit.js.map +1 -1
- package/dist-client/activities/activity-data-review-view.js +0 -28
- package/dist-client/activities/activity-data-review-view.js.map +1 -1
- package/dist-client/activities/activity-ooc-resolve-edit.d.ts +1 -1
- package/dist-client/activities/activity-ooc-resolve-edit.js +44 -48
- package/dist-client/activities/activity-ooc-resolve-edit.js.map +1 -1
- package/dist-client/activities/activity-ooc-resolve-view.d.ts +13 -0
- package/dist-client/activities/activity-ooc-resolve-view.js +15 -37
- package/dist-client/activities/activity-ooc-resolve-view.js.map +1 -1
- package/dist-client/activities/activity-ooc-review-edit.js +39 -29
- package/dist-client/activities/activity-ooc-review-edit.js.map +1 -1
- package/dist-client/activities/activity-ooc-review-view.js +0 -22
- package/dist-client/activities/activity-ooc-review-view.js.map +1 -1
- package/dist-client/bootstrap.d.ts +4 -4
- package/dist-client/bootstrap.js +4 -4
- package/dist-client/bootstrap.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -6
|
@@ -38,13 +38,7 @@ export class DataCollectActivityEdit extends localize(i18next)(LitElement) {
|
|
|
38
38
|
@query('ox-data-entry-form') entryForm!: OxDataEntryForm
|
|
39
39
|
|
|
40
40
|
render() {
|
|
41
|
-
return html`
|
|
42
|
-
<ox-data-entry-form
|
|
43
|
-
.dataSet=${this.dataSet}
|
|
44
|
-
.value=${this.output}
|
|
45
|
-
@change=${this._updateDataItems}
|
|
46
|
-
></ox-data-entry-form>
|
|
47
|
-
`
|
|
41
|
+
return html` <ox-data-entry-form .dataSet=${this.dataSet} .value=${this.output} @change=${this._updateDataItems}></ox-data-entry-form> `
|
|
48
42
|
}
|
|
49
43
|
|
|
50
44
|
async _updateDataItems() {
|
|
@@ -31,34 +31,6 @@ export class DataReviewActivityEdit extends localize(i18next)(LitElement) {
|
|
|
31
31
|
padding: var(--padding-wide);
|
|
32
32
|
overflow: auto;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
label[instruction] {
|
|
36
|
-
display: flex;
|
|
37
|
-
flex-direction: column;
|
|
38
|
-
|
|
39
|
-
padding: var(--padding-wide);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
label[instruction] div {
|
|
43
|
-
display: flex;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
mwc-icon {
|
|
47
|
-
color: var(--status-danger-color);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
textarea {
|
|
51
|
-
border: var(--input-field-border);
|
|
52
|
-
border-radius: var(--input-border-radius);
|
|
53
|
-
padding: var(--input-field-padding);
|
|
54
|
-
font: var(--input-field-font);
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
.button-container {
|
|
58
|
-
display: flex;
|
|
59
|
-
margin-left: auto;
|
|
60
|
-
padding: var(--padding-default);
|
|
61
|
-
}
|
|
62
34
|
`
|
|
63
35
|
]
|
|
64
36
|
|
|
@@ -31,34 +31,6 @@ export class DataReviewActivityView extends localize(i18next)(LitElement) {
|
|
|
31
31
|
padding: var(--padding-wide);
|
|
32
32
|
overflow: auto;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
label[instruction] {
|
|
36
|
-
display: flex;
|
|
37
|
-
flex-direction: column;
|
|
38
|
-
|
|
39
|
-
padding: var(--padding-wide);
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
label[instruction] div {
|
|
43
|
-
display: flex;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
mwc-icon {
|
|
47
|
-
color: var(--status-danger-color);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
textarea {
|
|
51
|
-
border: var(--input-field-border);
|
|
52
|
-
border-radius: var(--input-border-radius);
|
|
53
|
-
padding: var(--input-field-padding);
|
|
54
|
-
font: var(--input-field-font);
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
.button-container {
|
|
58
|
-
display: flex;
|
|
59
|
-
margin-left: auto;
|
|
60
|
-
padding: var(--padding-default);
|
|
61
|
-
}
|
|
62
34
|
`
|
|
63
35
|
]
|
|
64
36
|
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import '@operato/dataset/ox-data-
|
|
1
|
+
import '@operato/dataset/ox-data-ooc-brief-view.js'
|
|
2
|
+
// import '@operato/dataset/ox-data-ooc-correction-part.js'
|
|
2
3
|
|
|
3
4
|
import gql from 'graphql-tag'
|
|
4
|
-
import { css, html, LitElement } from 'lit'
|
|
5
|
+
import { css, html, LitElement, nothing } from 'lit'
|
|
5
6
|
import { customElement, property, query, state } from 'lit/decorators.js'
|
|
6
7
|
|
|
7
8
|
import { client } from '@operato/graphql'
|
|
@@ -28,35 +29,12 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
28
29
|
overflow: auto;
|
|
29
30
|
}
|
|
30
31
|
|
|
31
|
-
ox-data-
|
|
32
|
+
ox-data-ooc-brief-view {
|
|
32
33
|
flex: 1;
|
|
33
34
|
padding: var(--padding-wide);
|
|
34
35
|
overflow: auto;
|
|
35
36
|
}
|
|
36
37
|
|
|
37
|
-
div[instruction] {
|
|
38
|
-
display: flex;
|
|
39
|
-
flex-direction: column;
|
|
40
|
-
|
|
41
|
-
padding: var(--padding-wide);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
label[instruction] {
|
|
45
|
-
display: flex;
|
|
46
|
-
flex-direction: column;
|
|
47
|
-
|
|
48
|
-
padding: var(--padding-wide);
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
label[instruction] h2 {
|
|
52
|
-
display: flex;
|
|
53
|
-
|
|
54
|
-
color: var(--title-text-color);
|
|
55
|
-
text-transform: capitalize;
|
|
56
|
-
margin: var(--title-margin);
|
|
57
|
-
align-items: center;
|
|
58
|
-
}
|
|
59
|
-
|
|
60
38
|
label[action] {
|
|
61
39
|
display: flex;
|
|
62
40
|
flex-direction: column;
|
|
@@ -79,25 +57,21 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
79
57
|
|
|
80
58
|
textarea {
|
|
81
59
|
border: var(--input-field-border);
|
|
82
|
-
border-radius:
|
|
83
|
-
|
|
60
|
+
border-radius: 10px;
|
|
61
|
+
margin: var(--margin-default);
|
|
62
|
+
padding: var(--input-padding);
|
|
84
63
|
font: var(--input-field-font);
|
|
85
64
|
|
|
86
65
|
resize: none;
|
|
87
66
|
outline: none;
|
|
88
67
|
min-height: 200px;
|
|
89
68
|
}
|
|
90
|
-
|
|
91
|
-
.button-container {
|
|
92
|
-
display: flex;
|
|
93
|
-
margin-left: auto;
|
|
94
|
-
padding: var(--padding-default);
|
|
95
|
-
}
|
|
96
69
|
`
|
|
97
70
|
]
|
|
98
71
|
|
|
99
72
|
@property({ type: Object }) input?: any
|
|
100
73
|
@property({ type: Object }) output?: any
|
|
74
|
+
@property({ type: Object }) activityThread?: any
|
|
101
75
|
|
|
102
76
|
@state() dataOoc?: any
|
|
103
77
|
|
|
@@ -105,25 +79,24 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
105
79
|
|
|
106
80
|
render() {
|
|
107
81
|
const action = this.output?.action
|
|
82
|
+
const state = this.activityThread?.state
|
|
83
|
+
const editable = state == 'assigned' || state == 'started'
|
|
108
84
|
|
|
109
85
|
return html`
|
|
110
86
|
<div content>
|
|
111
|
-
<ox-data-
|
|
87
|
+
<ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
|
|
112
88
|
</div>
|
|
113
89
|
|
|
114
|
-
<
|
|
115
|
-
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective instruction')}</span></h2>
|
|
116
|
-
<div content>${this.input?.instruction}</div>
|
|
117
|
-
</div>
|
|
90
|
+
<!-- <ox-data-ooc-correction-part .dataOoc=${this.dataOoc}></ox-data-ooc-correction-part> -->
|
|
118
91
|
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
92
|
+
${editable
|
|
93
|
+
? html`
|
|
94
|
+
<label action>
|
|
95
|
+
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective action')}</span></h2>
|
|
96
|
+
<textarea placeholder=${String(i18next.t('text.corrective action placeholder'))} .value=${action || ''} @change=${this.onChangeAction}></textarea>
|
|
97
|
+
</label>
|
|
98
|
+
`
|
|
99
|
+
: nothing}
|
|
127
100
|
`
|
|
128
101
|
}
|
|
129
102
|
|
|
@@ -162,6 +135,9 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
162
135
|
useCase
|
|
163
136
|
data
|
|
164
137
|
judgment
|
|
138
|
+
history
|
|
139
|
+
correctiveAction
|
|
140
|
+
correctiveInstruction
|
|
165
141
|
dataItems {
|
|
166
142
|
name
|
|
167
143
|
description
|
|
@@ -178,7 +154,17 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
178
154
|
}
|
|
179
155
|
workDate
|
|
180
156
|
workShift
|
|
157
|
+
reviewer {
|
|
158
|
+
id
|
|
159
|
+
name
|
|
160
|
+
}
|
|
161
|
+
corrector {
|
|
162
|
+
id
|
|
163
|
+
name
|
|
164
|
+
}
|
|
181
165
|
collectedAt
|
|
166
|
+
reviewedAt
|
|
167
|
+
correctedAt
|
|
182
168
|
}
|
|
183
169
|
}
|
|
184
170
|
`,
|
|
@@ -187,7 +173,17 @@ class OocResolveActivityEdit extends localize(i18next)(LitElement) {
|
|
|
187
173
|
}
|
|
188
174
|
})
|
|
189
175
|
|
|
190
|
-
|
|
176
|
+
const dataOoc = {
|
|
177
|
+
...response.data.dataOoc
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
if (this.activityThread?.output) {
|
|
181
|
+
dataOoc.correctiveAction = this.activityThread.output.action
|
|
182
|
+
dataOoc.correctedAt = this.activityThread.updatedAt
|
|
183
|
+
dataOoc.corrector = this.activityThread.assignee
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
this.dataOoc = dataOoc
|
|
191
187
|
}
|
|
192
188
|
}
|
|
193
189
|
}
|
|
@@ -9,7 +9,7 @@ import { i18next, localize } from '@operato/i18n'
|
|
|
9
9
|
import { ScrollbarStyles } from '@operato/styles'
|
|
10
10
|
|
|
11
11
|
@customElement('activity-ooc-resolve-view')
|
|
12
|
-
class OocResolveActivityView extends localize(i18next)(LitElement) {
|
|
12
|
+
export class OocResolveActivityView extends localize(i18next)(LitElement) {
|
|
13
13
|
static styles = [
|
|
14
14
|
ScrollbarStyles,
|
|
15
15
|
css`
|
|
@@ -33,47 +33,12 @@ class OocResolveActivityView extends localize(i18next)(LitElement) {
|
|
|
33
33
|
padding: var(--padding-wide);
|
|
34
34
|
overflow: auto;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
div[instruction] {
|
|
38
|
-
display: flex;
|
|
39
|
-
flex-direction: column;
|
|
40
|
-
|
|
41
|
-
padding: var(--padding-wide);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
div[instruction] div {
|
|
45
|
-
display: flex;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
div[instruction] div[content] {
|
|
49
|
-
display: flex;
|
|
50
|
-
min-height: 50px;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
div[action] {
|
|
54
|
-
display: flex;
|
|
55
|
-
flex-direction: column;
|
|
56
|
-
|
|
57
|
-
padding: var(--padding-wide);
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
div[action] div {
|
|
61
|
-
display: flex;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
div[action] div[content] {
|
|
65
|
-
display: flex;
|
|
66
|
-
min-height: 50px;
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
mwc-icon {
|
|
70
|
-
color: var(--status-danger-color);
|
|
71
|
-
}
|
|
72
36
|
`
|
|
73
37
|
]
|
|
74
38
|
|
|
75
39
|
@property({ type: Object }) input?: any
|
|
76
40
|
@property({ type: Object }) output?: any
|
|
41
|
+
@property({ type: Object }) activityApproval?: any
|
|
77
42
|
|
|
78
43
|
@state() dataOoc?: any
|
|
79
44
|
|
|
@@ -147,7 +112,20 @@ class OocResolveActivityView extends localize(i18next)(LitElement) {
|
|
|
147
112
|
}
|
|
148
113
|
})
|
|
149
114
|
|
|
150
|
-
|
|
115
|
+
const dataOoc = {
|
|
116
|
+
...response.data.dataOoc
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
const activityThread = this.activityApproval?.activityThread
|
|
120
|
+
|
|
121
|
+
if (activityThread?.output) {
|
|
122
|
+
/* approval 에서 사용되는 경우 corrective 관련정보를 보완한다. - approval과정에서는 아직 dataOoc.correctiveAction 정보는 채워지지 않았기 때문. */
|
|
123
|
+
dataOoc.correctiveAction = activityThread.output.action
|
|
124
|
+
dataOoc.correctedAt = activityThread.updatedAt
|
|
125
|
+
dataOoc.corrector = activityThread.assignee
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
this.dataOoc = dataOoc
|
|
151
129
|
}
|
|
152
130
|
}
|
|
153
131
|
}
|
|
@@ -39,47 +39,50 @@ class OocReviewActivityEdit extends localize(i18next)(LitElement) {
|
|
|
39
39
|
flex-direction: column;
|
|
40
40
|
|
|
41
41
|
padding: var(--padding-wide);
|
|
42
|
-
}
|
|
43
42
|
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
h2 {
|
|
44
|
+
display: flex;
|
|
46
45
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
46
|
+
color: var(--title-text-color);
|
|
47
|
+
text-transform: capitalize;
|
|
48
|
+
margin: var(--title-margin);
|
|
49
|
+
align-items: center;
|
|
50
|
+
}
|
|
52
51
|
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
52
|
+
div {
|
|
53
|
+
padding: var(--padding-wide);
|
|
54
|
+
font: var(--input-field-font);
|
|
55
|
+
}
|
|
56
56
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
padding: var(--input-field-padding);
|
|
61
|
-
font: var(--input-field-font);
|
|
57
|
+
mwc-icon {
|
|
58
|
+
color: var(--status-danger-color);
|
|
59
|
+
}
|
|
62
60
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
61
|
+
textarea {
|
|
62
|
+
border: var(--input-field-border);
|
|
63
|
+
border-radius: 10px;
|
|
64
|
+
margin: var(--margin-default);
|
|
65
|
+
padding: var(--input-padding);
|
|
66
|
+
font: var(--input-field-font);
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
68
|
+
resize: none;
|
|
69
|
+
outline: none;
|
|
70
|
+
min-height: 200px;
|
|
71
|
+
}
|
|
72
72
|
}
|
|
73
73
|
`
|
|
74
74
|
]
|
|
75
75
|
|
|
76
76
|
@property({ type: Object }) input?: any
|
|
77
77
|
@property({ type: Object }) output?: any
|
|
78
|
+
@property({ type: Object }) activityThread?: any
|
|
78
79
|
|
|
79
80
|
@state() dataOoc?: any
|
|
80
81
|
|
|
81
82
|
render() {
|
|
82
83
|
const instruction = this.output?.instruction
|
|
84
|
+
const { state } = this.activityThread || {}
|
|
85
|
+
const editable = state == 'assigned' || state == 'started' || state == 'submitted'
|
|
83
86
|
|
|
84
87
|
return html`
|
|
85
88
|
<div content>
|
|
@@ -88,11 +91,15 @@ class OocReviewActivityEdit extends localize(i18next)(LitElement) {
|
|
|
88
91
|
|
|
89
92
|
<label instruction>
|
|
90
93
|
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective instruction')}</span></h2>
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
94
|
+
${editable
|
|
95
|
+
? html`
|
|
96
|
+
<textarea
|
|
97
|
+
placeholder=${String(i18next.t('text.corrective instruction placeholder'))}
|
|
98
|
+
.value=${instruction || ''}
|
|
99
|
+
@change=${this.onChangeInstruction}
|
|
100
|
+
></textarea>
|
|
101
|
+
`
|
|
102
|
+
: html`<div>${instruction}</div>`}
|
|
96
103
|
</label>
|
|
97
104
|
`
|
|
98
105
|
}
|
|
@@ -33,26 +33,6 @@ class OocReviewActivityView extends localize(i18next)(LitElement) {
|
|
|
33
33
|
padding: var(--padding-wide);
|
|
34
34
|
overflow: auto;
|
|
35
35
|
}
|
|
36
|
-
|
|
37
|
-
div[instruction] {
|
|
38
|
-
display: flex;
|
|
39
|
-
flex-direction: column;
|
|
40
|
-
|
|
41
|
-
padding: var(--padding-wide);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
div[instruction] div {
|
|
45
|
-
display: flex;
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
div[instruction] div[content] {
|
|
49
|
-
display: flex;
|
|
50
|
-
min-height: 50px;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
mwc-icon {
|
|
54
|
-
color: var(--status-danger-color);
|
|
55
|
-
}
|
|
56
36
|
`
|
|
57
37
|
]
|
|
58
38
|
|
|
@@ -62,8 +42,6 @@ class OocReviewActivityView extends localize(i18next)(LitElement) {
|
|
|
62
42
|
@state() dataOoc?: any
|
|
63
43
|
|
|
64
44
|
render() {
|
|
65
|
-
const instruction = this.output?.instruction
|
|
66
|
-
|
|
67
45
|
return html`
|
|
68
46
|
<div content>
|
|
69
47
|
<ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
|
package/client/bootstrap.ts
CHANGED
|
@@ -1,19 +1,15 @@
|
|
|
1
1
|
import './activities/activity-data-collect-edit' /* refered by the activity template (activity-data-collect) on server */
|
|
2
|
-
import './activities/activity-ooc-review-edit' /* refered by the activity template (activity-ooc-review) on server */
|
|
3
|
-
import './activities/activity-ooc-resolve-edit' /* refered by the activity template (activity-ooc-resolve) on server */
|
|
4
2
|
import './activities/activity-data-collect-view' /* refered by the activity template (activity-data-collect) on server */
|
|
5
|
-
import './activities/activity-ooc-review-view' /* refered by the activity template (activity-ooc-review) on server */
|
|
6
|
-
import './activities/activity-ooc-resolve-view' /* refered by the activity template (activity-ooc-resolve) on server */
|
|
7
3
|
import './activities/activity-data-review-edit' /* refered by the activity template (activity-data-review) on server */
|
|
8
4
|
import './activities/activity-data-review-view' /* refered by the activity template (activity-data-review) on server */
|
|
5
|
+
import './activities/activity-ooc-review-edit' /* refered by the activity template (activity-ooc-review) on server */
|
|
6
|
+
import './activities/activity-ooc-review-view' /* refered by the activity template (activity-ooc-review) on server */
|
|
7
|
+
import './activities/activity-ooc-resolve-edit' /* refered by the activity template (activity-ooc-resolve) on server */
|
|
8
|
+
import './activities/activity-ooc-resolve-view' /* refered by the activity template (activity-ooc-resolve) on server */
|
|
9
9
|
import '@operato/app/filter-renderer.js' /* register resource-object filter renderer */
|
|
10
10
|
|
|
11
11
|
import { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'
|
|
12
|
-
import {
|
|
13
|
-
OxGristRendererJson5,
|
|
14
|
-
registerEditor as registerGristEditor,
|
|
15
|
-
registerRenderer as registerGristRenderer
|
|
16
|
-
} from '@operato/data-grist'
|
|
12
|
+
import { OxGristRendererJson5, registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist'
|
|
17
13
|
import { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor/ox-grist-editor-data-item-spec.js'
|
|
18
14
|
import { OxGristEditorPartitionKeys } from '@operato/grist-editor/ox-grist-editor-partition-keys.js'
|
|
19
15
|
import { OxGristRendererPartitionKeys } from '@operato/grist-editor/ox-grist-renderer-partition-keys.js'
|
|
@@ -9,13 +9,7 @@ import { ScrollbarStyles } from '@operato/styles';
|
|
|
9
9
|
import { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js';
|
|
10
10
|
let DataCollectActivityEdit = class DataCollectActivityEdit extends localize(i18next)(LitElement) {
|
|
11
11
|
render() {
|
|
12
|
-
return html `
|
|
13
|
-
<ox-data-entry-form
|
|
14
|
-
.dataSet=${this.dataSet}
|
|
15
|
-
.value=${this.output}
|
|
16
|
-
@change=${this._updateDataItems}
|
|
17
|
-
></ox-data-entry-form>
|
|
18
|
-
`;
|
|
12
|
+
return html ` <ox-data-entry-form .dataSet=${this.dataSet} .value=${this.output} @change=${this._updateDataItems}></ox-data-entry-form> `;
|
|
19
13
|
}
|
|
20
14
|
async _updateDataItems() {
|
|
21
15
|
this.output = this.entryForm.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-data-collect-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-collect-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAIjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA0BxE,MAAM;QACJ,OAAO,IAAI,CAAA
|
|
1
|
+
{"version":3,"file":"activity-data-collect-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-collect-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAIjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA0BxE,MAAM;QACJ,OAAO,IAAI,CAAA,iCAAiC,IAAI,CAAC,OAAO,WAAW,IAAI,CAAC,MAAM,YAAY,IAAI,CAAC,gBAAgB,yBAAyB,CAAA;IAC1I,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAA;QAElC,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CACH,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,YAAY,EAAE,CAAA;SACpB;IACH,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAA;QAE/B,IAAI,EAAE,EAAE;YACN,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;SAuBT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AAjFM,8BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;KAaF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;uDAAa;AAExC;IAAC,KAAK,EAAE;;wDAAmC;AAE3C;IAAC,KAAK,CAAC,oBAAoB,CAAC;8BAAa,eAAe;0DAAA;AAxB7C,uBAAuB;IADnC,aAAa,CAAC,4BAA4B,CAAC;GAC/B,uBAAuB,CAmFnC;SAnFY,uBAAuB","sourcesContent":["import '@operato/dataset/ox-data-entry-form.js'\n\nimport gql from 'graphql-tag'\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, query, state } from 'lit/decorators.js'\n\nimport { client } from '@operato/graphql'\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\nimport { OxDataEntryForm } from '@operato/dataset/ox-data-entry-form.js'\nimport { DataSet } from '@operato/dataset'\n\n@customElement('activity-data-collect-edit')\nexport class DataCollectActivityEdit extends localize(i18next)(LitElement) {\n static styles = [\n ScrollbarStyles,\n css`\n :host {\n display: flex;\n flex-direction: column;\n\n background-color: #fff;\n }\n\n ox-data-entry-form {\n flex: 1;\n padding: 10px;\n overflow: auto;\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n\n @state() dataSet?: DataSet & { id: string }\n\n @query('ox-data-entry-form') entryForm!: OxDataEntryForm\n\n render() {\n return html` <ox-data-entry-form .dataSet=${this.dataSet} .value=${this.output} @change=${this._updateDataItems}></ox-data-entry-form> `\n }\n\n async _updateDataItems() {\n this.output = this.entryForm.value\n\n this.dispatchEvent(\n new CustomEvent('change', {\n detail: this.output\n })\n )\n }\n\n updated(changes) {\n if (changes.has('input')) {\n this.fetchDataSet()\n }\n }\n\n async fetchDataSet() {\n const id = this.input.dataSetId\n\n if (id) {\n const response = await client.query({\n query: gql`\n query ($id: String!) {\n dataSet(id: $id) {\n id\n name\n description\n useCase\n dataItems {\n name\n description\n active\n hidden\n tag\n group\n type\n unit\n options\n quota\n spec\n stat\n }\n }\n }\n `,\n variables: {\n id\n }\n })\n\n this.dataSet = response.data.dataSet\n }\n }\n}\n"]}
|
|
@@ -53,34 +53,6 @@ DataReviewActivityEdit.styles = [
|
|
|
53
53
|
padding: var(--padding-wide);
|
|
54
54
|
overflow: auto;
|
|
55
55
|
}
|
|
56
|
-
|
|
57
|
-
label[instruction] {
|
|
58
|
-
display: flex;
|
|
59
|
-
flex-direction: column;
|
|
60
|
-
|
|
61
|
-
padding: var(--padding-wide);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
label[instruction] div {
|
|
65
|
-
display: flex;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
mwc-icon {
|
|
69
|
-
color: var(--status-danger-color);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
textarea {
|
|
73
|
-
border: var(--input-field-border);
|
|
74
|
-
border-radius: var(--input-border-radius);
|
|
75
|
-
padding: var(--input-field-padding);
|
|
76
|
-
font: var(--input-field-font);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
.button-container {
|
|
80
|
-
display: flex;
|
|
81
|
-
margin-left: auto;
|
|
82
|
-
padding: var(--padding-default);
|
|
83
|
-
}
|
|
84
56
|
`
|
|
85
57
|
];
|
|
86
58
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-data-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"activity-data-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAgCvE,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,UAAU;;KAErD,CAAA;IACH,CAAC;IAED,mBAAmB,CAAC,CAAQ;QAC1B,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAA;QAClB,IAAI,CAAC,MAAM,CAAC,WAAW,GAAI,CAAC,CAAC,MAA8B,CAAC,KAAK,CAAA;QAEjE,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CACH,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,CAAA;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;;AA3DM,6BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;KAqBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAa;AAExC;IAAC,KAAK,EAAE;;0DAAiB;AA9Bd,sBAAsB;IADlC,aAAa,CAAC,2BAA2B,CAAC;GAC9B,sBAAsB,CA6DlC;SA7DY,sBAAsB","sourcesContent":["import '@operato/dataset/ox-data-entry-form.js'\n\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, state } from 'lit/decorators.js'\n\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\n\n@customElement('activity-data-review-edit')\nexport class DataReviewActivityEdit extends localize(i18next)(LitElement) {\n static styles = [\n ScrollbarStyles,\n css`\n :host {\n display: flex;\n flex-direction: column;\n\n background-color: #fff;\n }\n\n div[content] {\n flex: 1;\n flex-direction: column;\n\n display: flex;\n overflow: auto;\n }\n\n ox-data-sample-view {\n flex: 1;\n padding: var(--padding-wide);\n overflow: auto;\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n\n @state() dataReview?: any\n\n render() {\n return html`\n <div content>\n <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>\n </div>\n `\n }\n\n onChangeInstruction(e: Event) {\n this.output ||= {}\n this.output.instruction = (e.target as HTMLTextAreaElement).value\n\n this.dispatchEvent(\n new CustomEvent('change', {\n detail: this.output\n })\n )\n }\n\n updated(changes) {\n if (changes.has('input')) {\n this.fetchDataAssign()\n }\n }\n\n async fetchDataAssign() {\n const dataSample = this.input?.dataSample\n this.dataReview = dataSample\n }\n}\n"]}
|
|
@@ -53,34 +53,6 @@ DataReviewActivityView.styles = [
|
|
|
53
53
|
padding: var(--padding-wide);
|
|
54
54
|
overflow: auto;
|
|
55
55
|
}
|
|
56
|
-
|
|
57
|
-
label[instruction] {
|
|
58
|
-
display: flex;
|
|
59
|
-
flex-direction: column;
|
|
60
|
-
|
|
61
|
-
padding: var(--padding-wide);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
label[instruction] div {
|
|
65
|
-
display: flex;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
mwc-icon {
|
|
69
|
-
color: var(--status-danger-color);
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
textarea {
|
|
73
|
-
border: var(--input-field-border);
|
|
74
|
-
border-radius: var(--input-border-radius);
|
|
75
|
-
padding: var(--input-field-padding);
|
|
76
|
-
font: var(--input-field-font);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
.button-container {
|
|
80
|
-
display: flex;
|
|
81
|
-
margin-left: auto;
|
|
82
|
-
padding: var(--padding-default);
|
|
83
|
-
}
|
|
84
56
|
`
|
|
85
57
|
];
|
|
86
58
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-data-review-view.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-view.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"activity-data-review-view.js","sourceRoot":"","sources":["../../client/activities/activity-data-review-view.ts"],"names":[],"mappings":";AAAA,OAAO,wCAAwC,CAAA;AAE/C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAElE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAgCvE,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,UAAU;;KAErD,CAAA;IACH,CAAC;IAED,mBAAmB,CAAC,CAAQ;QAC1B,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAA;QAClB,IAAI,CAAC,MAAM,CAAC,WAAW,GAAI,CAAC,CAAC,MAA8B,CAAC,KAAK,CAAA;QAEjE,IAAI,CAAC,aAAa,CAChB,IAAI,WAAW,CAAC,QAAQ,EAAE;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CACH,CAAA;IACH,CAAC;IAED,OAAO,CAAC,OAAO;QACb,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxB,IAAI,CAAC,eAAe,EAAE,CAAA;SACvB;IACH,CAAC;IAED,KAAK,CAAC,eAAe;;QACnB,MAAM,UAAU,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,UAAU,CAAA;QACzC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;IAC9B,CAAC;;AA3DM,6BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;KAqBF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAa;AAExC;IAAC,KAAK,EAAE;;0DAAiB;AA9Bd,sBAAsB;IADlC,aAAa,CAAC,2BAA2B,CAAC;GAC9B,sBAAsB,CA6DlC;SA7DY,sBAAsB","sourcesContent":["import '@operato/dataset/ox-data-entry-form.js'\n\nimport { css, html, LitElement } from 'lit'\nimport { customElement, property, state } from 'lit/decorators.js'\n\nimport { i18next, localize } from '@operato/i18n'\nimport { ScrollbarStyles } from '@operato/styles'\n\n@customElement('activity-data-review-view')\nexport class DataReviewActivityView extends localize(i18next)(LitElement) {\n static styles = [\n ScrollbarStyles,\n css`\n :host {\n display: flex;\n flex-direction: column;\n\n background-color: #fff;\n }\n\n div[content] {\n flex: 1;\n flex-direction: column;\n\n display: flex;\n overflow: auto;\n }\n\n ox-data-sample-view {\n flex: 1;\n padding: var(--padding-wide);\n overflow: auto;\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n\n @state() dataReview?: any\n\n render() {\n return html`\n <div content>\n <ox-data-sample-view .dataSample=${this.dataReview}></ox-data-sample-view>\n </div>\n `\n }\n\n onChangeInstruction(e: Event) {\n this.output ||= {}\n this.output.instruction = (e.target as HTMLTextAreaElement).value\n\n this.dispatchEvent(\n new CustomEvent('change', {\n detail: this.output\n })\n )\n }\n\n updated(changes) {\n if (changes.has('input')) {\n this.fetchDataAssign()\n }\n }\n\n async fetchDataAssign() {\n const dataSample = this.input?.dataSample\n this.dataReview = dataSample\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import '@operato/dataset/ox-data-
|
|
1
|
+
import '@operato/dataset/ox-data-ooc-brief-view.js';
|