@things-factory/dataset 7.0.0-alpha.0 → 7.0.0-alpha.18
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-collect-view.ts +7 -0
- package/client/activities/activity-data-review-edit.ts +66 -32
- package/client/activities/activity-data-review-view.ts +75 -29
- package/client/activities/activity-ooc-resolve-edit.ts +44 -48
- package/client/activities/activity-ooc-resolve-view.ts +25 -35
- package/client/activities/activity-ooc-review-edit.ts +36 -29
- package/client/activities/activity-ooc-review-view.ts +9 -19
- package/client/bootstrap.ts +5 -9
- package/client/pages/data-entry/data-entry-list-page.ts +8 -23
- package/client/pages/data-ooc/data-ooc-list-page.ts +71 -27
- package/client/pages/data-ooc/{data-ooc-view-page.ts → data-ooc-page.ts} +45 -1
- package/client/pages/data-ooc/data-ooc-view.ts +198 -41
- package/client/pages/data-ooc/data-oocs-page.ts +200 -0
- package/client/pages/data-sample/data-sample-list-page.ts +53 -31
- package/client/pages/data-sample/{data-sample-view-page.ts → data-sample-page.ts} +8 -1
- package/client/pages/data-sample/data-sample-search-page.ts +30 -25
- package/client/pages/data-sample/data-sample-view.ts +192 -21
- package/client/pages/data-sample/data-samples-page.ts +249 -0
- package/client/pages/data-sensor/data-sensor-list-page.ts +28 -6
- package/client/pages/data-set/data-item-list.ts +14 -8
- package/client/pages/data-set/data-set-list-page.ts +11 -21
- package/client/pages/data-summary/data-summary-list-page.ts +12 -24
- package/client/route.ts +10 -2
- 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-collect-view.js +7 -0
- package/dist-client/activities/activity-data-collect-view.js.map +1 -1
- package/dist-client/activities/activity-data-review-edit.d.ts +1 -1
- package/dist-client/activities/activity-data-review-edit.js +63 -33
- package/dist-client/activities/activity-data-review-edit.js.map +1 -1
- package/dist-client/activities/activity-data-review-view.d.ts +1 -1
- package/dist-client/activities/activity-data-review-view.js +72 -30
- 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 +24 -34
- 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 +9 -19
- 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/pages/data-entry/data-entry-list-page.js +3 -15
- package/dist-client/pages/data-entry/data-entry-list-page.js.map +1 -1
- package/dist-client/pages/data-ooc/data-ooc-list-page.d.ts +6 -0
- package/dist-client/pages/data-ooc/data-ooc-list-page.js +67 -24
- package/dist-client/pages/data-ooc/data-ooc-list-page.js.map +1 -1
- package/dist-client/pages/data-ooc/{data-ooc-view-page.js → data-ooc-page.js} +46 -2
- package/dist-client/pages/data-ooc/data-ooc-page.js.map +1 -0
- package/dist-client/pages/data-ooc/data-ooc-view.d.ts +11 -4
- package/dist-client/pages/data-ooc/data-ooc-view.js +193 -48
- package/dist-client/pages/data-ooc/data-ooc-view.js.map +1 -1
- package/dist-client/pages/data-ooc/data-oocs-page.d.ts +18 -0
- package/dist-client/pages/data-ooc/data-oocs-page.js +200 -0
- package/dist-client/pages/data-ooc/data-oocs-page.js.map +1 -0
- package/dist-client/pages/data-sample/data-sample-list-page.d.ts +6 -1
- package/dist-client/pages/data-sample/data-sample-list-page.js +51 -28
- package/dist-client/pages/data-sample/data-sample-list-page.js.map +1 -1
- package/dist-client/pages/data-sample/{data-sample-view-page.js → data-sample-page.js} +9 -2
- package/dist-client/pages/data-sample/data-sample-page.js.map +1 -0
- package/dist-client/pages/data-sample/data-sample-search-page.d.ts +6 -1
- package/dist-client/pages/data-sample/data-sample-search-page.js +28 -22
- package/dist-client/pages/data-sample/data-sample-search-page.js.map +1 -1
- package/dist-client/pages/data-sample/data-sample-view.d.ts +18 -0
- package/dist-client/pages/data-sample/data-sample-view.js +186 -19
- package/dist-client/pages/data-sample/data-sample-view.js.map +1 -1
- package/dist-client/pages/data-sample/data-samples-page.d.ts +21 -0
- package/dist-client/pages/data-sample/data-samples-page.js +249 -0
- package/dist-client/pages/data-sample/data-samples-page.js.map +1 -0
- package/dist-client/pages/data-sensor/data-sensor-list-page.js +28 -6
- package/dist-client/pages/data-sensor/data-sensor-list-page.js.map +1 -1
- package/dist-client/pages/data-set/data-item-list.js +14 -8
- package/dist-client/pages/data-set/data-item-list.js.map +1 -1
- package/dist-client/pages/data-set/data-set-list-page.js +3 -10
- package/dist-client/pages/data-set/data-set-list-page.js.map +1 -1
- package/dist-client/pages/data-summary/data-summary-list-page.js +12 -21
- package/dist-client/pages/data-summary/data-summary-list-page.js.map +1 -1
- package/dist-client/route.js +8 -2
- package/dist-client/route.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/activities/activity-data-collect.js.map +1 -1
- package/dist-server/activities/activity-data-review.js.map +1 -1
- package/dist-server/activities/activity-ooc-review.js +3 -2
- package/dist-server/activities/activity-ooc-review.js.map +1 -1
- package/dist-server/controllers/create-data-sample.js +27 -29
- package/dist-server/controllers/create-data-sample.js.map +1 -1
- package/dist-server/controllers/{generate-data-summary.js → finalize-data-collection.js} +10 -30
- package/dist-server/controllers/finalize-data-collection.js.map +1 -0
- package/dist-server/controllers/issue-collect-data.js +55 -0
- package/dist-server/controllers/issue-collect-data.js.map +1 -0
- package/dist-server/controllers/query-data-summary-by-period.js +4 -9
- package/dist-server/controllers/query-data-summary-by-period.js.map +1 -1
- package/dist-server/engine/index.js +4 -0
- package/dist-server/engine/index.js.map +1 -0
- package/dist-server/engine/task/create-data-sample.js +80 -0
- package/dist-server/engine/task/create-data-sample.js.map +1 -0
- package/dist-server/engine/task/index.js +5 -0
- package/dist-server/engine/task/index.js.map +1 -0
- package/dist-server/engine/task/issue-collect-data.js +40 -0
- package/dist-server/engine/task/issue-collect-data.js.map +1 -0
- package/dist-server/index.js +1 -0
- package/dist-server/index.js.map +1 -1
- package/dist-server/routes.js +36 -65
- package/dist-server/routes.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc-query.js +32 -0
- package/dist-server/service/data-ooc/data-ooc-query.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc-subscription.js +4 -4
- package/dist-server/service/data-ooc/data-ooc-subscription.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc.js +44 -37
- package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
- package/dist-server/service/data-sample/data-sample-query.js +24 -0
- package/dist-server/service/data-sample/data-sample-query.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +30 -31
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/dist-server/service/data-sensor/data-sensor-query.js +16 -1
- package/dist-server/service/data-sensor/data-sensor-query.js.map +1 -1
- package/dist-server/service/data-sensor/data-sensor-type.js +8 -0
- package/dist-server/service/data-sensor/data-sensor-type.js.map +1 -1
- package/dist-server/service/data-sensor/data-sensor.js +15 -1
- package/dist-server/service/data-sensor/data-sensor.js.map +1 -1
- package/dist-server/service/data-set/data-item-type.js +17 -2
- package/dist-server/service/data-set/data-item-type.js.map +1 -1
- package/dist-server/service/data-set/data-set-mutation.js +2 -2
- package/dist-server/service/data-set/data-set-mutation.js.map +1 -1
- package/dist-server/service/data-set/data-set-query.js +2 -2
- package/dist-server/service/data-set/data-set-query.js.map +1 -1
- package/dist-server/service/data-summary/data-summary-mutation.js +34 -5
- package/dist-server/service/data-summary/data-summary-mutation.js.map +1 -1
- package/dist-server/service/data-summary/data-summary.js +8 -8
- package/dist-server/service/data-summary/data-summary.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/helps/config/dataArchive.md +21 -0
- package/helps/config/dataReport.md +34 -0
- package/helps/dataset/task/create-data-sample.ja.md +28 -0
- package/helps/dataset/task/create-data-sample.ko.md +28 -0
- package/helps/dataset/task/create-data-sample.md +28 -0
- package/helps/dataset/task/create-data-sample.ms.md +30 -0
- package/helps/dataset/task/create-data-sample.zh.md +28 -0
- package/helps/dataset/task/issue-collect-data.ja.md +35 -0
- package/helps/dataset/task/issue-collect-data.ko.md +32 -0
- package/helps/dataset/task/issue-collect-data.md +32 -0
- package/helps/dataset/task/issue-collect-data.ms.md +34 -0
- package/helps/dataset/task/issue-collect-data.zh.md +32 -0
- package/helps/dataset/ui/data-item-list.ko.md +17 -2
- package/package.json +14 -11
- package/server/activities/activity-data-collect.ts +3 -11
- package/server/activities/activity-data-review.ts +1 -5
- package/server/activities/activity-ooc-review.ts +6 -16
- package/server/controllers/create-data-sample.ts +31 -38
- package/server/controllers/{generate-data-summary.ts → finalize-data-collection.ts} +7 -39
- package/server/controllers/issue-collect-data.ts +61 -0
- package/server/controllers/query-data-summary-by-period.ts +5 -18
- package/server/engine/index.ts +1 -0
- package/server/engine/task/create-data-sample.ts +92 -0
- package/server/engine/task/index.ts +2 -0
- package/server/engine/task/issue-collect-data.ts +45 -0
- package/server/index.ts +1 -0
- package/server/routes.ts +47 -76
- package/server/service/data-ooc/data-ooc-query.ts +17 -0
- package/server/service/data-ooc/data-ooc-subscription.ts +7 -7
- package/server/service/data-ooc/data-ooc.ts +39 -51
- package/server/service/data-sample/data-sample-query.ts +17 -17
- package/server/service/data-sample/data-sample.ts +29 -52
- package/server/service/data-sensor/data-sensor-query.ts +13 -1
- package/server/service/data-sensor/data-sensor-type.ts +6 -0
- package/server/service/data-sensor/data-sensor.ts +13 -11
- package/server/service/data-set/data-item-type.ts +19 -10
- package/server/service/data-set/data-set-mutation.ts +9 -31
- package/server/service/data-set/data-set-query.ts +7 -7
- package/server/service/data-summary/data-summary-mutation.ts +24 -7
- package/server/service/data-summary/data-summary.ts +10 -23
- package/things-factory.config.js +10 -2
- package/translations/en.json +17 -3
- package/translations/ja.json +14 -2
- package/translations/ko.json +16 -2
- package/translations/ms.json +13 -1
- package/translations/zh.json +14 -2
- package/dist-client/pages/data-ooc/data-ooc-view-page.js.map +0 -1
- package/dist-client/pages/data-sample/data-sample-view-page.js.map +0 -1
- package/dist-server/controllers/generate-data-summary.js.map +0 -1
- /package/dist-client/pages/data-ooc/{data-ooc-view-page.d.ts → data-ooc-page.d.ts} +0 -0
- /package/dist-client/pages/data-sample/{data-sample-view-page.d.ts → data-sample-page.d.ts} +0 -0
@@ -1,7 +1,8 @@
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
2
|
-
import '@operato/dataset/ox-data-
|
2
|
+
import '@operato/dataset/ox-data-ooc-brief-view.js';
|
3
|
+
// import '@operato/dataset/ox-data-ooc-correction-part.js'
|
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
|
import { client } from '@operato/graphql';
|
7
8
|
import { i18next, localize } from '@operato/i18n';
|
@@ -10,24 +11,23 @@ let OocResolveActivityEdit = class OocResolveActivityEdit extends localize(i18ne
|
|
10
11
|
render() {
|
11
12
|
var _a, _b;
|
12
13
|
const action = (_a = this.output) === null || _a === void 0 ? void 0 : _a.action;
|
14
|
+
const state = (_b = this.activityThread) === null || _b === void 0 ? void 0 : _b.state;
|
15
|
+
const editable = state == 'assigned' || state == 'started';
|
13
16
|
return html `
|
14
17
|
<div content>
|
15
|
-
<ox-data-
|
18
|
+
<ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
|
16
19
|
</div>
|
17
20
|
|
18
|
-
<
|
19
|
-
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective instruction')}</span></h2>
|
20
|
-
<div content>${(_b = this.input) === null || _b === void 0 ? void 0 : _b.instruction}</div>
|
21
|
-
</div>
|
21
|
+
<!-- <ox-data-ooc-correction-part .dataOoc=${this.dataOoc}></ox-data-ooc-correction-part> -->
|
22
22
|
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
23
|
+
${editable
|
24
|
+
? html `
|
25
|
+
<label action>
|
26
|
+
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective action')}</span></h2>
|
27
|
+
<textarea placeholder=${String(i18next.t('text.corrective action placeholder'))} .value=${action || ''} @change=${this.onChangeAction}></textarea>
|
28
|
+
</label>
|
29
|
+
`
|
30
|
+
: nothing}
|
31
31
|
`;
|
32
32
|
}
|
33
33
|
onChangeAction(e) {
|
@@ -43,6 +43,7 @@ let OocResolveActivityEdit = class OocResolveActivityEdit extends localize(i18ne
|
|
43
43
|
}
|
44
44
|
}
|
45
45
|
async fetchDataOoc() {
|
46
|
+
var _a;
|
46
47
|
const id = this.input.dataOocId;
|
47
48
|
if (id) {
|
48
49
|
const response = await client.query({
|
@@ -59,6 +60,9 @@ let OocResolveActivityEdit = class OocResolveActivityEdit extends localize(i18ne
|
|
59
60
|
useCase
|
60
61
|
data
|
61
62
|
judgment
|
63
|
+
history
|
64
|
+
correctiveAction
|
65
|
+
correctiveInstruction
|
62
66
|
dataItems {
|
63
67
|
name
|
64
68
|
description
|
@@ -75,7 +79,17 @@ let OocResolveActivityEdit = class OocResolveActivityEdit extends localize(i18ne
|
|
75
79
|
}
|
76
80
|
workDate
|
77
81
|
workShift
|
82
|
+
reviewer {
|
83
|
+
id
|
84
|
+
name
|
85
|
+
}
|
86
|
+
corrector {
|
87
|
+
id
|
88
|
+
name
|
89
|
+
}
|
78
90
|
collectedAt
|
91
|
+
reviewedAt
|
92
|
+
correctedAt
|
79
93
|
}
|
80
94
|
}
|
81
95
|
`,
|
@@ -83,7 +97,13 @@ let OocResolveActivityEdit = class OocResolveActivityEdit extends localize(i18ne
|
|
83
97
|
id
|
84
98
|
}
|
85
99
|
});
|
86
|
-
|
100
|
+
const dataOoc = Object.assign({}, response.data.dataOoc);
|
101
|
+
if ((_a = this.activityThread) === null || _a === void 0 ? void 0 : _a.output) {
|
102
|
+
dataOoc.correctiveAction = this.activityThread.output.action;
|
103
|
+
dataOoc.correctedAt = this.activityThread.updatedAt;
|
104
|
+
dataOoc.corrector = this.activityThread.assignee;
|
105
|
+
}
|
106
|
+
this.dataOoc = dataOoc;
|
87
107
|
}
|
88
108
|
}
|
89
109
|
};
|
@@ -105,35 +125,12 @@ OocResolveActivityEdit.styles = [
|
|
105
125
|
overflow: auto;
|
106
126
|
}
|
107
127
|
|
108
|
-
ox-data-
|
128
|
+
ox-data-ooc-brief-view {
|
109
129
|
flex: 1;
|
110
130
|
padding: var(--padding-wide);
|
111
131
|
overflow: auto;
|
112
132
|
}
|
113
133
|
|
114
|
-
div[instruction] {
|
115
|
-
display: flex;
|
116
|
-
flex-direction: column;
|
117
|
-
|
118
|
-
padding: var(--padding-wide);
|
119
|
-
}
|
120
|
-
|
121
|
-
label[instruction] {
|
122
|
-
display: flex;
|
123
|
-
flex-direction: column;
|
124
|
-
|
125
|
-
padding: var(--padding-wide);
|
126
|
-
}
|
127
|
-
|
128
|
-
label[instruction] h2 {
|
129
|
-
display: flex;
|
130
|
-
|
131
|
-
color: var(--title-text-color);
|
132
|
-
text-transform: capitalize;
|
133
|
-
margin: var(--title-margin);
|
134
|
-
align-items: center;
|
135
|
-
}
|
136
|
-
|
137
134
|
label[action] {
|
138
135
|
display: flex;
|
139
136
|
flex-direction: column;
|
@@ -156,20 +153,15 @@ OocResolveActivityEdit.styles = [
|
|
156
153
|
|
157
154
|
textarea {
|
158
155
|
border: var(--input-field-border);
|
159
|
-
border-radius:
|
160
|
-
|
156
|
+
border-radius: 10px;
|
157
|
+
margin: var(--margin-default);
|
158
|
+
padding: var(--input-padding);
|
161
159
|
font: var(--input-field-font);
|
162
160
|
|
163
161
|
resize: none;
|
164
162
|
outline: none;
|
165
163
|
min-height: 200px;
|
166
164
|
}
|
167
|
-
|
168
|
-
.button-container {
|
169
|
-
display: flex;
|
170
|
-
margin-left: auto;
|
171
|
-
padding: var(--padding-default);
|
172
|
-
}
|
173
165
|
`
|
174
166
|
];
|
175
167
|
__decorate([
|
@@ -180,6 +172,10 @@ __decorate([
|
|
180
172
|
property({ type: Object }),
|
181
173
|
__metadata("design:type", Object)
|
182
174
|
], OocResolveActivityEdit.prototype, "output", void 0);
|
175
|
+
__decorate([
|
176
|
+
property({ type: Object }),
|
177
|
+
__metadata("design:type", Object)
|
178
|
+
], OocResolveActivityEdit.prototype, "activityThread", void 0);
|
183
179
|
__decorate([
|
184
180
|
state(),
|
185
181
|
__metadata("design:type", Object)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"activity-ooc-resolve-edit.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-resolve-edit.ts"],"names":[],"mappings":";AAAA,OAAO,
|
1
|
+
{"version":3,"file":"activity-ooc-resolve-edit.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-resolve-edit.ts"],"names":[],"mappings":"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","sourcesContent":["import '@operato/dataset/ox-data-ooc-brief-view.js'\n// import '@operato/dataset/ox-data-ooc-correction-part.js'\n\nimport gql from 'graphql-tag'\nimport { css, html, LitElement, nothing } 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'\n\n@customElement('activity-ooc-resolve-edit')\nclass OocResolveActivityEdit 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-ooc-brief-view {\n flex: 1;\n padding: var(--padding-wide);\n overflow: auto;\n }\n\n label[action] {\n display: flex;\n flex-direction: column;\n\n padding: var(--padding-wide);\n }\n\n label[action] h2 {\n display: flex;\n\n color: var(--title-text-color);\n text-transform: capitalize;\n margin: var(--title-margin);\n align-items: center;\n }\n\n mwc-icon {\n color: var(--status-danger-color);\n }\n\n textarea {\n border: var(--input-field-border);\n border-radius: 10px;\n margin: var(--margin-default);\n padding: var(--input-padding);\n font: var(--input-field-font);\n\n resize: none;\n outline: none;\n min-height: 200px;\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n @property({ type: Object }) activityThread?: any\n\n @state() dataOoc?: any\n\n @query('textarea') actionTextArea!: HTMLTextAreaElement\n\n render() {\n const action = this.output?.action\n const state = this.activityThread?.state\n const editable = state == 'assigned' || state == 'started'\n\n return html`\n <div content>\n <ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>\n </div>\n\n <!-- <ox-data-ooc-correction-part .dataOoc=${this.dataOoc}></ox-data-ooc-correction-part> -->\n\n ${editable\n ? html`\n <label action>\n <h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective action')}</span></h2>\n <textarea placeholder=${String(i18next.t('text.corrective action placeholder'))} .value=${action || ''} @change=${this.onChangeAction}></textarea>\n </label>\n `\n : nothing}\n `\n }\n\n onChangeAction(e: Event) {\n this.output ||= {}\n this.output.action = (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.fetchDataOoc()\n }\n }\n\n async fetchDataOoc() {\n const id = this.input.dataOocId\n\n if (id) {\n const response = await client.query({\n query: gql`\n query ($id: String!) {\n dataOoc(id: $id) {\n id\n name\n description\n ooc\n oos\n state\n type\n useCase\n data\n judgment\n history\n correctiveAction\n correctiveInstruction\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 workDate\n workShift\n reviewer {\n id\n name\n }\n corrector {\n id\n name\n }\n collectedAt\n reviewedAt\n correctedAt\n }\n }\n `,\n variables: {\n id\n }\n })\n\n const dataOoc = {\n ...response.data.dataOoc\n }\n\n if (this.activityThread?.output) {\n dataOoc.correctiveAction = this.activityThread.output.action\n dataOoc.correctedAt = this.activityThread.updatedAt\n dataOoc.corrector = this.activityThread.assignee\n }\n\n this.dataOoc = dataOoc\n }\n }\n}\n"]}
|
@@ -1 +1,14 @@
|
|
1
1
|
import '@operato/dataset/ox-data-ooc-brief-view.js';
|
2
|
+
import { LitElement } from 'lit';
|
3
|
+
declare const OocResolveActivityView_base: (new (...args: any[]) => LitElement) & typeof LitElement;
|
4
|
+
export declare class OocResolveActivityView extends OocResolveActivityView_base {
|
5
|
+
static styles: import("lit").CSSResult[];
|
6
|
+
input?: any;
|
7
|
+
output?: any;
|
8
|
+
activityApproval?: any;
|
9
|
+
dataOoc?: any;
|
10
|
+
render(): import("lit-html").TemplateResult<1>;
|
11
|
+
updated(changes: any): void;
|
12
|
+
fetchDataOoc(): Promise<void>;
|
13
|
+
}
|
14
|
+
export {};
|
@@ -20,6 +20,7 @@ let OocResolveActivityView = class OocResolveActivityView extends localize(i18ne
|
|
20
20
|
}
|
21
21
|
}
|
22
22
|
async fetchDataOoc() {
|
23
|
+
var _a;
|
23
24
|
const id = this.input.dataOocId;
|
24
25
|
if (id) {
|
25
26
|
const response = await client.query({
|
@@ -73,7 +74,15 @@ let OocResolveActivityView = class OocResolveActivityView extends localize(i18ne
|
|
73
74
|
id
|
74
75
|
}
|
75
76
|
});
|
76
|
-
|
77
|
+
const dataOoc = Object.assign({}, response.data.dataOoc);
|
78
|
+
const activityThread = (_a = this.activityApproval) === null || _a === void 0 ? void 0 : _a.activityThread;
|
79
|
+
if (activityThread === null || activityThread === void 0 ? void 0 : activityThread.output) {
|
80
|
+
/* approval 에서 사용되는 경우 corrective 관련정보를 보완한다. - approval과정에서는 아직 dataOoc.correctiveAction 정보는 채워지지 않았기 때문. */
|
81
|
+
dataOoc.correctiveAction = activityThread.output.action;
|
82
|
+
dataOoc.correctedAt = activityThread.updatedAt;
|
83
|
+
dataOoc.corrector = activityThread.assignee;
|
84
|
+
}
|
85
|
+
this.dataOoc = dataOoc;
|
77
86
|
}
|
78
87
|
}
|
79
88
|
};
|
@@ -101,40 +110,16 @@ OocResolveActivityView.styles = [
|
|
101
110
|
overflow: auto;
|
102
111
|
}
|
103
112
|
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
}
|
110
|
-
|
111
|
-
div[instruction] div {
|
112
|
-
display: flex;
|
113
|
-
}
|
114
|
-
|
115
|
-
div[instruction] div[content] {
|
116
|
-
display: flex;
|
117
|
-
min-height: 50px;
|
118
|
-
}
|
119
|
-
|
120
|
-
div[action] {
|
121
|
-
display: flex;
|
122
|
-
flex-direction: column;
|
123
|
-
|
124
|
-
padding: var(--padding-wide);
|
125
|
-
}
|
126
|
-
|
127
|
-
div[action] div {
|
128
|
-
display: flex;
|
129
|
-
}
|
130
|
-
|
131
|
-
div[action] div[content] {
|
132
|
-
display: flex;
|
133
|
-
min-height: 50px;
|
134
|
-
}
|
113
|
+
@media print {
|
114
|
+
:host {
|
115
|
+
display: block;
|
116
|
+
overflow: visible;
|
117
|
+
}
|
135
118
|
|
136
|
-
|
137
|
-
|
119
|
+
div[content] {
|
120
|
+
display: block;
|
121
|
+
overflow: visible;
|
122
|
+
}
|
138
123
|
}
|
139
124
|
`
|
140
125
|
];
|
@@ -146,6 +131,10 @@ __decorate([
|
|
146
131
|
property({ type: Object }),
|
147
132
|
__metadata("design:type", Object)
|
148
133
|
], OocResolveActivityView.prototype, "output", void 0);
|
134
|
+
__decorate([
|
135
|
+
property({ type: Object }),
|
136
|
+
__metadata("design:type", Object)
|
137
|
+
], OocResolveActivityView.prototype, "activityApproval", void 0);
|
149
138
|
__decorate([
|
150
139
|
state(),
|
151
140
|
__metadata("design:type", Object)
|
@@ -153,4 +142,5 @@ __decorate([
|
|
153
142
|
OocResolveActivityView = __decorate([
|
154
143
|
customElement('activity-ooc-resolve-view')
|
155
144
|
], OocResolveActivityView);
|
145
|
+
export { OocResolveActivityView };
|
156
146
|
//# sourceMappingURL=activity-ooc-resolve-view.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"activity-ooc-resolve-view.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-resolve-view.ts"],"names":[],"mappings":";AAAA,OAAO,4CAA4C,CAAA;AAEnD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;
|
1
|
+
{"version":3,"file":"activity-ooc-resolve-view.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-resolve-view.ts"],"names":[],"mappings":";AAAA,OAAO,4CAA4C,CAAA;AAEnD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;AAG1C,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA6CvE,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,OAAO;;KAElD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA6CT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,MAAM,OAAO,qBACR,QAAQ,CAAC,IAAI,CAAC,OAAO,CACzB,CAAA;YAED,MAAM,cAAc,GAAG,MAAA,IAAI,CAAC,gBAAgB,0CAAE,cAAc,CAAA;YAE5D,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE;gBAC1B,6GAA6G;gBAC7G,OAAO,CAAC,gBAAgB,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAA;gBACvD,OAAO,CAAC,WAAW,GAAG,cAAc,CAAC,SAAS,CAAA;gBAC9C,OAAO,CAAC,SAAS,GAAG,cAAc,CAAC,QAAQ,CAAA;aAC5C;YAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;SACvB;IACH,CAAC;;AAjIM,6BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;sDAAa;AACxC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;gEAAuB;AAElD;IAAC,KAAK,EAAE;;uDAAc;AA3CX,sBAAsB;IADlC,aAAa,CAAC,2BAA2B,CAAC;GAC9B,sBAAsB,CAmIlC;SAnIY,sBAAsB","sourcesContent":["import '@operato/dataset/ox-data-ooc-brief-view.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'\n\n@customElement('activity-ooc-resolve-view')\nexport class OocResolveActivityView 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-ooc-brief-view {\n flex: 1;\n padding: var(--padding-wide);\n overflow: auto;\n }\n\n @media print {\n :host {\n display: block;\n overflow: visible;\n }\n\n div[content] {\n display: block;\n overflow: visible;\n }\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n @property({ type: Object }) activityApproval?: any\n\n @state() dataOoc?: any\n\n render() {\n return html`\n <div content>\n <ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>\n </div>\n `\n }\n\n updated(changes) {\n if (changes.has('input')) {\n this.fetchDataOoc()\n }\n }\n\n async fetchDataOoc() {\n const id = this.input.dataOocId\n\n if (id) {\n const response = await client.query({\n query: gql`\n query ($id: String!) {\n dataOoc(id: $id) {\n id\n name\n description\n ooc\n oos\n state\n type\n useCase\n data\n judgment\n history\n correctiveAction\n correctiveInstruction\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 workDate\n workShift\n reviewer {\n id\n name\n }\n corrector {\n id\n name\n }\n collectedAt\n reviewedAt\n correctedAt\n }\n }\n `,\n variables: {\n id\n }\n })\n\n const dataOoc = {\n ...response.data.dataOoc\n }\n\n const activityThread = this.activityApproval?.activityThread\n\n if (activityThread?.output) {\n /* approval 에서 사용되는 경우 corrective 관련정보를 보완한다. - approval과정에서는 아직 dataOoc.correctiveAction 정보는 채워지지 않았기 때문. */\n dataOoc.correctiveAction = activityThread.output.action\n dataOoc.correctedAt = activityThread.updatedAt\n dataOoc.corrector = activityThread.assignee\n }\n\n this.dataOoc = dataOoc\n }\n }\n}\n"]}
|
@@ -10,6 +10,8 @@ let OocReviewActivityEdit = class OocReviewActivityEdit extends localize(i18next
|
|
10
10
|
render() {
|
11
11
|
var _a;
|
12
12
|
const instruction = (_a = this.output) === null || _a === void 0 ? void 0 : _a.instruction;
|
13
|
+
const { state } = this.activityThread || {};
|
14
|
+
const editable = state == 'assigned' || state == 'started' || state == 'submitted';
|
13
15
|
return html `
|
14
16
|
<div content>
|
15
17
|
<ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>
|
@@ -17,11 +19,15 @@ let OocReviewActivityEdit = class OocReviewActivityEdit extends localize(i18next
|
|
17
19
|
|
18
20
|
<label instruction>
|
19
21
|
<h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective instruction')}</span></h2>
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
${editable
|
23
|
+
? html `
|
24
|
+
<textarea
|
25
|
+
placeholder=${String(i18next.t('text.corrective instruction placeholder'))}
|
26
|
+
.value=${instruction || ''}
|
27
|
+
@change=${this.onChangeInstruction}
|
28
|
+
></textarea>
|
29
|
+
`
|
30
|
+
: html `<div>${instruction}</div>`}
|
25
31
|
</label>
|
26
32
|
`;
|
27
33
|
}
|
@@ -112,36 +118,36 @@ OocReviewActivityEdit.styles = [
|
|
112
118
|
flex-direction: column;
|
113
119
|
|
114
120
|
padding: var(--padding-wide);
|
115
|
-
}
|
116
121
|
|
117
|
-
|
118
|
-
|
122
|
+
h2 {
|
123
|
+
display: flex;
|
119
124
|
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
+
color: var(--title-text-color);
|
126
|
+
text-transform: capitalize;
|
127
|
+
margin: var(--title-margin);
|
128
|
+
align-items: center;
|
129
|
+
}
|
125
130
|
|
126
|
-
|
127
|
-
|
128
|
-
|
131
|
+
div {
|
132
|
+
padding: var(--padding-wide);
|
133
|
+
font: var(--input-field-font);
|
134
|
+
}
|
129
135
|
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
padding: var(--input-field-padding);
|
134
|
-
font: var(--input-field-font);
|
136
|
+
mwc-icon {
|
137
|
+
color: var(--status-danger-color);
|
138
|
+
}
|
135
139
|
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
+
textarea {
|
141
|
+
border: var(--input-field-border);
|
142
|
+
border-radius: 10px;
|
143
|
+
margin: var(--margin-default);
|
144
|
+
padding: var(--input-padding);
|
145
|
+
font: var(--input-field-font);
|
140
146
|
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
147
|
+
resize: none;
|
148
|
+
outline: none;
|
149
|
+
min-height: 200px;
|
150
|
+
}
|
145
151
|
}
|
146
152
|
`
|
147
153
|
];
|
@@ -153,6 +159,10 @@ __decorate([
|
|
153
159
|
property({ type: Object }),
|
154
160
|
__metadata("design:type", Object)
|
155
161
|
], OocReviewActivityEdit.prototype, "output", void 0);
|
162
|
+
__decorate([
|
163
|
+
property({ type: Object }),
|
164
|
+
__metadata("design:type", Object)
|
165
|
+
], OocReviewActivityEdit.prototype, "activityThread", void 0);
|
156
166
|
__decorate([
|
157
167
|
state(),
|
158
168
|
__metadata("design:type", Object)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"activity-ooc-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,yCAAyC,CAAA;AAEhD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;AAGjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;
|
1
|
+
{"version":3,"file":"activity-ooc-review-edit.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-review-edit.ts"],"names":[],"mappings":";AAAA,OAAO,yCAAyC,CAAA;AAEhD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;AAGjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IAsE/D,MAAM;;QACJ,MAAM,WAAW,GAAG,MAAA,IAAI,CAAC,MAAM,0CAAE,WAAW,CAAA;QAC5C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,cAAc,IAAI,EAAE,CAAA;QAC3C,MAAM,QAAQ,GAAG,KAAK,IAAI,UAAU,IAAI,KAAK,IAAI,SAAS,IAAI,KAAK,IAAI,WAAW,CAAA;QAElF,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,OAAO;;;;2DAII,OAAO,CAAC,CAAC,CAAC,8BAA8B,CAAC;UAC1F,QAAQ;YACR,CAAC,CAAC,IAAI,CAAA;;8BAEc,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC;yBACjE,WAAW,IAAI,EAAE;0BAChB,IAAI,CAAC,mBAAmB;;aAErC;YACH,CAAC,CAAC,IAAI,CAAA,QAAQ,WAAW,QAAQ;;KAEtC,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,YAAY,EAAE,CAAA;SACpB;IACH,CAAC;IAED,KAAK,CAAC,YAAY;;QAChB,MAAM,EAAE,GAAG,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,CAAA;QAEhC,IAAI,EAAE,EAAE;YACN,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SAgCT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AA5JM,4BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0DF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;oDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAa;AACxC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;6DAAqB;AAEhD;IAAC,KAAK,EAAE;;sDAAc;AApElB,qBAAqB;IAD1B,aAAa,CAAC,0BAA0B,CAAC;GACpC,qBAAqB,CA8J1B","sourcesContent":["import '@operato/dataset/ox-data-sample-view.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'\n\n@customElement('activity-ooc-review-edit')\nclass OocReviewActivityEdit 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 label[instruction] {\n display: flex;\n flex-direction: column;\n\n padding: var(--padding-wide);\n\n h2 {\n display: flex;\n\n color: var(--title-text-color);\n text-transform: capitalize;\n margin: var(--title-margin);\n align-items: center;\n }\n\n div {\n padding: var(--padding-wide);\n font: var(--input-field-font);\n }\n\n mwc-icon {\n color: var(--status-danger-color);\n }\n\n textarea {\n border: var(--input-field-border);\n border-radius: 10px;\n margin: var(--margin-default);\n padding: var(--input-padding);\n font: var(--input-field-font);\n\n resize: none;\n outline: none;\n min-height: 200px;\n }\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n @property({ type: Object }) activityThread?: any\n\n @state() dataOoc?: any\n\n render() {\n const instruction = this.output?.instruction\n const { state } = this.activityThread || {}\n const editable = state == 'assigned' || state == 'started' || state == 'submitted'\n\n return html`\n <div content>\n <ox-data-sample-view .dataSample=${this.dataOoc}></ox-data-sample-view>\n </div>\n\n <label instruction>\n <h2><mwc-icon>build_circle</mwc-icon> <span>${i18next.t('label.corrective instruction')}</span></h2>\n ${editable\n ? html`\n <textarea\n placeholder=${String(i18next.t('text.corrective instruction placeholder'))}\n .value=${instruction || ''}\n @change=${this.onChangeInstruction}\n ></textarea>\n `\n : html`<div>${instruction}</div>`}\n </label>\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.fetchDataOoc()\n }\n }\n\n async fetchDataOoc() {\n const id = this.input?.dataOocId\n\n if (id) {\n const response = await client.query({\n query: gql`\n query ($id: String!) {\n dataOoc(id: $id) {\n id\n name\n description\n ooc\n oos\n state\n type\n useCase\n data\n judgment\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 workDate\n workShift\n collectedAt\n }\n }\n `,\n variables: {\n id\n }\n })\n\n this.dataOoc = response.data.dataOoc\n }\n }\n}\n"]}
|
@@ -8,8 +8,6 @@ import { i18next, localize } from '@operato/i18n';
|
|
8
8
|
import { ScrollbarStyles } from '@operato/styles';
|
9
9
|
let OocReviewActivityView = class OocReviewActivityView extends localize(i18next)(LitElement) {
|
10
10
|
render() {
|
11
|
-
var _a;
|
12
|
-
const instruction = (_a = this.output) === null || _a === void 0 ? void 0 : _a.instruction;
|
13
11
|
return html `
|
14
12
|
<div content>
|
15
13
|
<ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>
|
@@ -104,24 +102,16 @@ OocReviewActivityView.styles = [
|
|
104
102
|
overflow: auto;
|
105
103
|
}
|
106
104
|
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
}
|
113
|
-
|
114
|
-
div[instruction] div {
|
115
|
-
display: flex;
|
116
|
-
}
|
117
|
-
|
118
|
-
div[instruction] div[content] {
|
119
|
-
display: flex;
|
120
|
-
min-height: 50px;
|
121
|
-
}
|
105
|
+
@media print {
|
106
|
+
:host {
|
107
|
+
display: block;
|
108
|
+
overflow: visible;
|
109
|
+
}
|
122
110
|
|
123
|
-
|
124
|
-
|
111
|
+
div[content] {
|
112
|
+
display: block;
|
113
|
+
overflow: visible;
|
114
|
+
}
|
125
115
|
}
|
126
116
|
`
|
127
117
|
];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"activity-ooc-review-view.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-review-view.ts"],"names":[],"mappings":";AAAA,OAAO,4CAA4C,CAAA;AAEnD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;AAGjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;
|
1
|
+
{"version":3,"file":"activity-ooc-review-view.js","sourceRoot":"","sources":["../../client/activities/activity-ooc-review-view.ts"],"names":[],"mappings":";AAAA,OAAO,4CAA4C,CAAA;AAEnD,OAAO,GAAG,MAAM,aAAa,CAAA;AAC7B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC3C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAS,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;AAGjD,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,QAAQ,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC;IA4C/D,MAAM;QACJ,OAAO,IAAI,CAAA;;2CAE4B,IAAI,CAAC,OAAO;;KAElD,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,MAAA,IAAI,CAAC,KAAK,0CAAE,SAAS,CAAA;QAEhC,IAAI,EAAE,EAAE;YACN,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC;gBAClC,KAAK,EAAE,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;SA6CT;gBACD,SAAS,EAAE;oBACT,EAAE;iBACH;aACF,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAA;SACrC;IACH,CAAC;;AAnHM,4BAAM,GAAG;IACd,eAAe;IACf,GAAG,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiCF;CACF,CAAA;AAED;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;oDAAY;AACvC;IAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;;qDAAa;AAExC;IAAC,KAAK,EAAE;;sDAAc;AA1ClB,qBAAqB;IAD1B,aAAa,CAAC,0BAA0B,CAAC;GACpC,qBAAqB,CAqH1B","sourcesContent":["import '@operato/dataset/ox-data-ooc-brief-view.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'\n\n@customElement('activity-ooc-review-view')\nclass OocReviewActivityView 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-ooc-brief-view {\n flex: 1;\n padding: var(--padding-wide);\n overflow: auto;\n }\n\n @media print {\n :host {\n display: block;\n overflow: visible;\n }\n\n div[content] {\n display: block;\n overflow: visible;\n }\n }\n `\n ]\n\n @property({ type: Object }) input?: any\n @property({ type: Object }) output?: any\n\n @state() dataOoc?: any\n\n render() {\n return html`\n <div content>\n <ox-data-ooc-brief-view .dataOoc=${this.dataOoc}></ox-data-ooc-brief-view>\n </div>\n `\n }\n\n updated(changes) {\n if (changes.has('input')) {\n this.fetchDataOoc()\n }\n }\n\n async fetchDataOoc() {\n const id = this.input?.dataOocId\n\n if (id) {\n const response = await client.query({\n query: gql`\n query ($id: String!) {\n dataOoc(id: $id) {\n id\n name\n description\n ooc\n oos\n state\n type\n useCase\n data\n judgment\n history\n correctiveAction\n correctiveInstruction\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 workDate\n workShift\n reviewer {\n id\n name\n }\n corrector {\n id\n name\n }\n collectedAt\n reviewedAt\n correctedAt\n }\n }\n `,\n variables: {\n id\n }\n })\n\n this.dataOoc = response.data.dataOoc\n }\n }\n}\n"]}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
import './activities/activity-data-collect-edit';
|
2
|
-
import './activities/activity-ooc-review-edit';
|
3
|
-
import './activities/activity-ooc-resolve-edit';
|
4
2
|
import './activities/activity-data-collect-view';
|
5
|
-
import './activities/activity-ooc-review-view';
|
6
|
-
import './activities/activity-ooc-resolve-view';
|
7
3
|
import './activities/activity-data-review-edit';
|
8
4
|
import './activities/activity-data-review-view';
|
5
|
+
import './activities/activity-ooc-review-edit';
|
6
|
+
import './activities/activity-ooc-review-view';
|
7
|
+
import './activities/activity-ooc-resolve-edit';
|
8
|
+
import './activities/activity-ooc-resolve-view';
|
9
9
|
import '@operato/app/filter-renderer.js';
|
10
10
|
export default function bootstrap(): void;
|
package/dist-client/bootstrap.js
CHANGED
@@ -1,11 +1,11 @@
|
|
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
|
import { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js';
|
11
11
|
import { OxGristRendererJson5, registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../client/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,yCAAyC,CAAA,CAAC,wEAAwE;AACzH,OAAO,
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../client/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,yCAAyC,CAAA,CAAC,wEAAwE;AACzH,OAAO,yCAAyC,CAAA,CAAC,wEAAwE;AACzH,OAAO,wCAAwC,CAAA,CAAC,uEAAuE;AACvH,OAAO,wCAAwC,CAAA,CAAC,uEAAuE;AACvH,OAAO,uCAAuC,CAAA,CAAC,sEAAsE;AACrH,OAAO,uCAAuC,CAAA,CAAC,sEAAsE;AACrH,OAAO,wCAAwC,CAAA,CAAC,uEAAuE;AACvH,OAAO,wCAAwC,CAAA,CAAC,uEAAuE;AACvH,OAAO,iCAAiC,CAAA,CAAC,8CAA8C;AAEvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAA;AACrF,OAAO,EAAE,oBAAoB,EAAE,cAAc,IAAI,mBAAmB,EAAE,gBAAgB,IAAI,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAC5I,OAAO,EAAE,yBAAyB,EAAE,MAAM,iEAAiE,CAAA;AAC3G,OAAO,EAAE,0BAA0B,EAAE,MAAM,yDAAyD,CAAA;AACpG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2DAA2D,CAAA;AAExG,MAAM,CAAC,OAAO,UAAU,SAAS;IAC/B,mBAAmB,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAA;IAChE,qBAAqB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAA;IAE7D,mBAAmB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;IAEhD,mBAAmB,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAA;IACjE,qBAAqB,CAAC,gBAAgB,EAAE,4BAA4B,CAAC,CAAA;AACvE,CAAC","sourcesContent":["import './activities/activity-data-collect-edit' /* refered by the activity template (activity-data-collect) on server */\nimport './activities/activity-data-collect-view' /* refered by the activity template (activity-data-collect) on server */\nimport './activities/activity-data-review-edit' /* refered by the activity template (activity-data-review) on server */\nimport './activities/activity-data-review-view' /* refered by the activity template (activity-data-review) on server */\nimport './activities/activity-ooc-review-edit' /* refered by the activity template (activity-ooc-review) on server */\nimport './activities/activity-ooc-review-view' /* refered by the activity template (activity-ooc-review) on server */\nimport './activities/activity-ooc-resolve-edit' /* refered by the activity template (activity-ooc-resolve) on server */\nimport './activities/activity-ooc-resolve-view' /* refered by the activity template (activity-ooc-resolve) on server */\nimport '@operato/app/filter-renderer.js' /* register resource-object filter renderer */\n\nimport { OxGristEditorCode } from '@operato/app/grist-editor/ox-grist-editor-code.js'\nimport { OxGristRendererJson5, registerEditor as registerGristEditor, registerRenderer as registerGristRenderer } from '@operato/data-grist'\nimport { OxGristEditorDataItemSpec } from '@operato/dataset/grist-editor/ox-grist-editor-data-item-spec.js'\nimport { OxGristEditorPartitionKeys } from '@operato/grist-editor/ox-grist-editor-partition-keys.js'\nimport { OxGristRendererPartitionKeys } from '@operato/grist-editor/ox-grist-renderer-partition-keys.js'\n\nexport default function bootstrap() {\n registerGristEditor('data-item-spec', OxGristEditorDataItemSpec)\n registerGristRenderer('data-item-spec', OxGristRendererJson5)\n\n registerGristEditor('script', OxGristEditorCode)\n\n registerGristEditor('partition-keys', OxGristEditorPartitionKeys)\n registerGristRenderer('partition-keys', OxGristRendererPartitionKeys)\n}\n"]}
|
@@ -39,15 +39,7 @@ const showEntryView = async (columns, data, column, record, rowIndex) => {
|
|
39
39
|
const board = {
|
40
40
|
id: entryView
|
41
41
|
};
|
42
|
-
openPopup(html `
|
43
|
-
<ox-board-viewer
|
44
|
-
style="background-color: white;"
|
45
|
-
.board=${board}
|
46
|
-
.provider=${provider}
|
47
|
-
hide-fullscreen
|
48
|
-
hide-navigation
|
49
|
-
></ox-board-viewer>
|
50
|
-
`, {
|
42
|
+
openPopup(html ` <ox-board-viewer style="background-color: white;" .board=${board} .provider=${provider} hide-fullscreen hide-navigation></ox-board-viewer> `, {
|
51
43
|
closable: true,
|
52
44
|
backdrop: true,
|
53
45
|
size: 'large',
|
@@ -88,12 +80,7 @@ let DataEntryListPage = class DataEntryListPage extends connect(store)(localize(
|
|
88
80
|
render() {
|
89
81
|
const mode = 'CARD';
|
90
82
|
return html `
|
91
|
-
<ox-grist
|
92
|
-
.mode=${mode}
|
93
|
-
.config=${this.gristConfig}
|
94
|
-
.fetchHandler=${this.fetchHandler.bind(this)}
|
95
|
-
?url-params-sensitive=${this.active}
|
96
|
-
>
|
83
|
+
<ox-grist .mode=${mode} .config=${this.gristConfig} .fetchHandler=${this.fetchHandler.bind(this)} ?url-params-sensitive=${this.active}>
|
97
84
|
<div slot="headroom" class="header">
|
98
85
|
<div class="title">
|
99
86
|
<mwc-icon>summarize</mwc-icon>
|
@@ -258,6 +245,7 @@ let DataEntryListPage = class DataEntryListPage extends connect(store)(localize(
|
|
258
245
|
],
|
259
246
|
rows: {
|
260
247
|
appendable: false,
|
248
|
+
editable: false,
|
261
249
|
selectable: {
|
262
250
|
multiple: false
|
263
251
|
},
|