@things-factory/dataset 7.0.1-alpha.9 → 7.0.1-alpha.90
Sign up to get free protection for your applications and to get access to all the features.
- package/client/activities/activity-ooc-resolve-edit.ts +3 -3
- package/client/activities/activity-ooc-review-edit.ts +3 -2
- package/client/components/data-entry-form.ts +6 -13
- package/client/pages/data-archive/data-archive-list-page.ts +5 -17
- package/client/pages/data-archive/data-archive-request-popup.ts +7 -10
- package/client/pages/data-entry/data-entry-list-page.ts +2 -4
- package/client/pages/data-key-set/data-key-item-list.ts +8 -22
- package/client/pages/data-key-set/data-key-set-importer.ts +4 -11
- package/client/pages/data-key-set/data-key-set-list-page.ts +6 -5
- package/client/pages/data-ooc/data-ooc-list-page.ts +26 -17
- package/client/pages/data-ooc/data-ooc-view.ts +7 -6
- package/client/pages/data-report/data-report-list-page.ts +9 -27
- package/client/pages/data-report/data-report-samples-page.ts +1 -1
- package/client/pages/data-sample/data-sample-list-page.ts +30 -14
- package/client/pages/data-sample/data-sample-search-page.ts +22 -14
- package/client/pages/data-sample/data-sample-view.ts +7 -5
- package/client/pages/data-sensor/data-sensor-list-page.ts +20 -17
- package/client/pages/data-set/data-item-list.ts +7 -15
- package/client/pages/data-set/data-set-importer.ts +5 -17
- package/client/pages/data-set/data-set-list-page.ts +33 -15
- package/client/pages/data-summary/data-summary-list-page.ts +9 -10
- package/client/pages/data-summary/data-summary-period-page.ts +5 -23
- package/client/pages/data-summary/data-summary-search-page.ts +12 -35
- package/dist-client/activities/activity-ooc-resolve-edit.d.ts +1 -0
- package/dist-client/activities/activity-ooc-resolve-edit.js +3 -3
- package/dist-client/activities/activity-ooc-resolve-edit.js.map +1 -1
- package/dist-client/activities/activity-ooc-review-edit.d.ts +1 -0
- package/dist-client/activities/activity-ooc-review-edit.js +3 -2
- package/dist-client/activities/activity-ooc-review-edit.js.map +1 -1
- package/dist-client/components/data-entry-form.d.ts +1 -0
- package/dist-client/components/data-entry-form.js +5 -10
- package/dist-client/components/data-entry-form.js.map +1 -1
- package/dist-client/pages/data-archive/data-archive-list-page.d.ts +1 -0
- package/dist-client/pages/data-archive/data-archive-list-page.js +5 -17
- package/dist-client/pages/data-archive/data-archive-list-page.js.map +1 -1
- package/dist-client/pages/data-archive/data-archive-request-popup.d.ts +1 -1
- package/dist-client/pages/data-archive/data-archive-request-popup.js +6 -10
- package/dist-client/pages/data-archive/data-archive-request-popup.js.map +1 -1
- package/dist-client/pages/data-entry/data-entry-list-page.d.ts +1 -0
- package/dist-client/pages/data-entry/data-entry-list-page.js +2 -4
- package/dist-client/pages/data-entry/data-entry-list-page.js.map +1 -1
- package/dist-client/pages/data-key-set/data-key-item-list.d.ts +1 -0
- package/dist-client/pages/data-key-set/data-key-item-list.js +7 -22
- package/dist-client/pages/data-key-set/data-key-item-list.js.map +1 -1
- package/dist-client/pages/data-key-set/data-key-set-importer.d.ts +1 -0
- package/dist-client/pages/data-key-set/data-key-set-importer.js +4 -11
- package/dist-client/pages/data-key-set/data-key-set-importer.js.map +1 -1
- package/dist-client/pages/data-key-set/data-key-set-list-page.d.ts +11 -2
- package/dist-client/pages/data-key-set/data-key-set-list-page.js +6 -5
- package/dist-client/pages/data-key-set/data-key-set-list-page.js.map +1 -1
- package/dist-client/pages/data-ooc/data-ooc-list-page.d.ts +7 -0
- package/dist-client/pages/data-ooc/data-ooc-list-page.js +17 -10
- package/dist-client/pages/data-ooc/data-ooc-list-page.js.map +1 -1
- package/dist-client/pages/data-ooc/data-ooc-view.d.ts +2 -1
- package/dist-client/pages/data-ooc/data-ooc-view.js +7 -6
- package/dist-client/pages/data-ooc/data-ooc-view.js.map +1 -1
- package/dist-client/pages/data-report/data-report-list-page.d.ts +1 -0
- package/dist-client/pages/data-report/data-report-list-page.js +4 -19
- package/dist-client/pages/data-report/data-report-list-page.js.map +1 -1
- package/dist-client/pages/data-report/data-report-samples-page.js +1 -1
- package/dist-client/pages/data-report/data-report-samples-page.js.map +1 -1
- package/dist-client/pages/data-sample/data-sample-list-page.d.ts +7 -0
- package/dist-client/pages/data-sample/data-sample-list-page.js +22 -10
- package/dist-client/pages/data-sample/data-sample-list-page.js.map +1 -1
- package/dist-client/pages/data-sample/data-sample-search-page.d.ts +1 -0
- package/dist-client/pages/data-sample/data-sample-search-page.js +15 -9
- 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 +2 -0
- package/dist-client/pages/data-sample/data-sample-view.js +7 -5
- package/dist-client/pages/data-sample/data-sample-view.js.map +1 -1
- package/dist-client/pages/data-sensor/data-sensor-list-page.d.ts +17 -2
- package/dist-client/pages/data-sensor/data-sensor-list-page.js +19 -17
- package/dist-client/pages/data-sensor/data-sensor-list-page.js.map +1 -1
- package/dist-client/pages/data-set/data-item-list.d.ts +1 -1
- package/dist-client/pages/data-set/data-item-list.js +6 -15
- package/dist-client/pages/data-set/data-item-list.js.map +1 -1
- package/dist-client/pages/data-set/data-set-importer.d.ts +1 -0
- package/dist-client/pages/data-set/data-set-importer.js +5 -16
- package/dist-client/pages/data-set/data-set-importer.js.map +1 -1
- package/dist-client/pages/data-set/data-set-list-page.d.ts +17 -2
- package/dist-client/pages/data-set/data-set-list-page.js +23 -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.d.ts +1 -0
- package/dist-client/pages/data-summary/data-summary-list-page.js +9 -10
- package/dist-client/pages/data-summary/data-summary-list-page.js.map +1 -1
- package/dist-client/pages/data-summary/data-summary-period-page.d.ts +1 -0
- package/dist-client/pages/data-summary/data-summary-period-page.js +5 -23
- package/dist-client/pages/data-summary/data-summary-period-page.js.map +1 -1
- package/dist-client/pages/data-summary/data-summary-search-page.d.ts +1 -0
- package/dist-client/pages/data-summary/data-summary-search-page.js +7 -19
- package/dist-client/pages/data-summary/data-summary-search-page.js.map +1 -1
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-server/service/data-archive/data-archive.js +1 -1
- package/dist-server/service/data-archive/data-archive.js.map +1 -1
- package/dist-server/service/data-key-set/data-key-set.js +1 -1
- package/dist-server/service/data-key-set/data-key-set.js.map +1 -1
- package/dist-server/service/data-ooc/data-ooc.js +16 -4
- package/dist-server/service/data-ooc/data-ooc.js.map +1 -1
- package/dist-server/service/data-sample/data-sample.js +13 -3
- package/dist-server/service/data-sample/data-sample.js.map +1 -1
- package/dist-server/service/data-sensor/data-sensor.js +1 -1
- package/dist-server/service/data-sensor/data-sensor.js.map +1 -1
- package/dist-server/service/data-set-history/data-set-history.js +1 -1
- package/dist-server/service/data-set-history/data-set-history.js.map +1 -1
- package/dist-server/service/data-summary/data-summary.js +1 -1
- package/dist-server/service/data-summary/data-summary.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +16 -15
- package/server/service/data-archive/data-archive.ts +1 -1
- package/server/service/data-key-set/data-key-set.ts +1 -1
- package/server/service/data-ooc/data-ooc.ts +31 -5
- package/server/service/data-sample/data-sample.ts +37 -7
- package/server/service/data-sensor/data-sensor.ts +11 -2
- package/server/service/data-set-history/data-set-history.ts +3 -3
- package/server/service/data-summary/data-summary.ts +16 -3
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@things-factory/dataset",
|
3
|
-
"version": "7.0.1-alpha.
|
3
|
+
"version": "7.0.1-alpha.90",
|
4
4
|
"main": "dist-server/index.js",
|
5
5
|
"browser": "dist-client/index.js",
|
6
6
|
"things-factory": true,
|
@@ -27,8 +27,6 @@
|
|
27
27
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
28
28
|
},
|
29
29
|
"dependencies": {
|
30
|
-
"@material/mwc-fab": "^0.27.0",
|
31
|
-
"@material/mwc-icon": "^0.27.0",
|
32
30
|
"@operato/app": "^2.0.0-alpha.0",
|
33
31
|
"@operato/data-grist": "^2.0.0-alpha.0",
|
34
32
|
"@operato/dataset": "^2.0.0-alpha.0",
|
@@ -37,23 +35,26 @@
|
|
37
35
|
"@operato/grist-editor": "^2.0.0-alpha.0",
|
38
36
|
"@operato/i18n": "^2.0.0-alpha.0",
|
39
37
|
"@operato/layout": "^2.0.0-alpha.0",
|
38
|
+
"@operato/moment-timezone-es": "^2.0.0-alpha.0",
|
39
|
+
"@operato/p13n": "^2.0.0-alpha.0",
|
40
40
|
"@operato/shell": "^2.0.0-alpha.0",
|
41
41
|
"@operato/styles": "^2.0.0-alpha.0",
|
42
42
|
"@operato/utils": "^2.0.0-alpha.0",
|
43
|
-
"@things-factory/auth-base": "^7.0.1-alpha.
|
44
|
-
"@things-factory/aws-base": "^7.0.1-alpha.
|
45
|
-
"@things-factory/board-service": "^7.0.1-alpha.
|
46
|
-
"@things-factory/env": "^7.0.1-alpha.
|
47
|
-
"@things-factory/integration-base": "^7.0.1-alpha.
|
48
|
-
"@things-factory/organization": "^7.0.1-alpha.
|
49
|
-
"@things-factory/
|
50
|
-
"@things-factory/
|
51
|
-
"@things-factory/
|
52
|
-
"@things-factory/
|
43
|
+
"@things-factory/auth-base": "^7.0.1-alpha.90",
|
44
|
+
"@things-factory/aws-base": "^7.0.1-alpha.90",
|
45
|
+
"@things-factory/board-service": "^7.0.1-alpha.90",
|
46
|
+
"@things-factory/env": "^7.0.1-alpha.71",
|
47
|
+
"@things-factory/integration-base": "^7.0.1-alpha.90",
|
48
|
+
"@things-factory/organization": "^7.0.1-alpha.90",
|
49
|
+
"@things-factory/personalization": "^7.0.1-alpha.90",
|
50
|
+
"@things-factory/scheduler-client": "^7.0.1-alpha.90",
|
51
|
+
"@things-factory/shell": "^7.0.1-alpha.90",
|
52
|
+
"@things-factory/work-shift": "^7.0.1-alpha.90",
|
53
|
+
"@things-factory/worklist": "^7.0.1-alpha.90",
|
53
54
|
"cron-parser": "^4.3.0",
|
54
|
-
"moment-timezone": "^0.5.
|
55
|
+
"moment-timezone": "^0.5.45",
|
55
56
|
"simple-statistics": "^7.8.3",
|
56
57
|
"statistics": "^3.3.0"
|
57
58
|
},
|
58
|
-
"gitHead": "
|
59
|
+
"gitHead": "79086a82c81dadca6c105a37fa91a2cd34a74183"
|
59
60
|
}
|
@@ -1,5 +1,16 @@
|
|
1
1
|
import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
|
2
|
-
import {
|
2
|
+
import {
|
3
|
+
Column,
|
4
|
+
CreateDateColumn,
|
5
|
+
Entity,
|
6
|
+
Index,
|
7
|
+
JoinColumn,
|
8
|
+
ManyToOne,
|
9
|
+
OneToOne,
|
10
|
+
PrimaryGeneratedColumn,
|
11
|
+
RelationId,
|
12
|
+
UpdateDateColumn
|
13
|
+
} from 'typeorm'
|
3
14
|
|
4
15
|
import { User } from '@things-factory/auth-base'
|
5
16
|
import { config } from '@things-factory/env'
|
@@ -33,7 +44,7 @@ export class DataOoc {
|
|
33
44
|
readonly id: string
|
34
45
|
|
35
46
|
@ManyToOne(type => Domain)
|
36
|
-
@Field(
|
47
|
+
@Field(type => Domain)
|
37
48
|
domain?: Domain
|
38
49
|
|
39
50
|
@RelationId((dataOoc: DataOoc) => dataOoc.domain)
|
@@ -72,14 +83,24 @@ export class DataOoc {
|
|
72
83
|
|
73
84
|
@Column({
|
74
85
|
nullable: true,
|
75
|
-
type:
|
86
|
+
type:
|
87
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
88
|
+
? 'longtext'
|
89
|
+
: DATABASE_TYPE == 'oracle'
|
90
|
+
? 'clob'
|
91
|
+
: 'varchar'
|
76
92
|
})
|
77
93
|
@Field({ nullable: true })
|
78
94
|
correctiveInstruction?: string
|
79
95
|
|
80
96
|
@Column({
|
81
97
|
nullable: true,
|
82
|
-
type:
|
98
|
+
type:
|
99
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
100
|
+
? 'longtext'
|
101
|
+
: DATABASE_TYPE == 'oracle'
|
102
|
+
? 'clob'
|
103
|
+
: 'varchar'
|
83
104
|
})
|
84
105
|
@Field({ nullable: true })
|
85
106
|
correctiveAction?: string
|
@@ -133,7 +154,12 @@ export class DataOoc {
|
|
133
154
|
|
134
155
|
@Column({
|
135
156
|
nullable: true,
|
136
|
-
type:
|
157
|
+
type:
|
158
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
159
|
+
? 'longtext'
|
160
|
+
: DATABASE_TYPE == 'oracle'
|
161
|
+
? 'clob'
|
162
|
+
: 'varchar'
|
137
163
|
})
|
138
164
|
@Field({ nullable: true })
|
139
165
|
rawData?: string
|
@@ -1,5 +1,16 @@
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
2
|
-
import {
|
2
|
+
import {
|
3
|
+
Column,
|
4
|
+
CreateDateColumn,
|
5
|
+
Entity,
|
6
|
+
Index,
|
7
|
+
JoinColumn,
|
8
|
+
ManyToOne,
|
9
|
+
OneToOne,
|
10
|
+
PrimaryGeneratedColumn,
|
11
|
+
RelationId,
|
12
|
+
UpdateDateColumn
|
13
|
+
} from 'typeorm'
|
3
14
|
|
4
15
|
import { User } from '@things-factory/auth-base'
|
5
16
|
import { config } from '@things-factory/env'
|
@@ -13,10 +24,24 @@ import { DataOoc } from '../data-ooc/data-ooc'
|
|
13
24
|
const ORMCONFIG = config.get('ormconfig', {})
|
14
25
|
const DATABASE_TYPE = ORMCONFIG.type
|
15
26
|
@Entity()
|
16
|
-
@Index(
|
17
|
-
|
18
|
-
|
19
|
-
|
27
|
+
@Index(
|
28
|
+
'ix_data_sample_0',
|
29
|
+
(dataSample: DataSample) => [
|
30
|
+
dataSample.domain,
|
31
|
+
dataSample.dataSet,
|
32
|
+
dataSample.workDate,
|
33
|
+
dataSample.workShift,
|
34
|
+
dataSample.collectedAt
|
35
|
+
],
|
36
|
+
{
|
37
|
+
unique: false
|
38
|
+
}
|
39
|
+
)
|
40
|
+
@Index(
|
41
|
+
'ix_data_sample_1',
|
42
|
+
(dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
|
43
|
+
{ unique: false }
|
44
|
+
)
|
20
45
|
@ObjectType({ description: 'Entity for DataSample' })
|
21
46
|
export class DataSample {
|
22
47
|
@PrimaryGeneratedColumn('uuid')
|
@@ -24,7 +49,7 @@ export class DataSample {
|
|
24
49
|
readonly id: string
|
25
50
|
|
26
51
|
@ManyToOne(type => Domain)
|
27
|
-
@Field(
|
52
|
+
@Field(type => Domain)
|
28
53
|
domain?: Domain
|
29
54
|
|
30
55
|
@RelationId((dataSample: DataSample) => dataSample.domain)
|
@@ -74,7 +99,12 @@ export class DataSample {
|
|
74
99
|
|
75
100
|
@Column({
|
76
101
|
nullable: true,
|
77
|
-
type:
|
102
|
+
type:
|
103
|
+
DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
104
|
+
? 'longtext'
|
105
|
+
: DATABASE_TYPE == 'oracle'
|
106
|
+
? 'clob'
|
107
|
+
: 'varchar',
|
78
108
|
transformer: json5Transformer
|
79
109
|
})
|
80
110
|
@Field({ nullable: true })
|
@@ -1,5 +1,14 @@
|
|
1
1
|
import { Field, ID, ObjectType } from 'type-graphql'
|
2
|
-
import {
|
2
|
+
import {
|
3
|
+
Column,
|
4
|
+
CreateDateColumn,
|
5
|
+
Entity,
|
6
|
+
Index,
|
7
|
+
ManyToOne,
|
8
|
+
PrimaryGeneratedColumn,
|
9
|
+
RelationId,
|
10
|
+
UpdateDateColumn
|
11
|
+
} from 'typeorm'
|
3
12
|
|
4
13
|
import { Domain } from '@things-factory/shell'
|
5
14
|
import { Appliance, User } from '@things-factory/auth-base'
|
@@ -23,7 +32,7 @@ export class DataSensor {
|
|
23
32
|
readonly id: string
|
24
33
|
|
25
34
|
@ManyToOne(type => Domain)
|
26
|
-
@Field(
|
35
|
+
@Field(type => Domain)
|
27
36
|
domain?: Domain
|
28
37
|
|
29
38
|
@RelationId((dataSensor: DataSensor) => dataSensor.domain)
|
@@ -47,7 +47,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
|
|
47
47
|
readonly version: number = 1
|
48
48
|
|
49
49
|
@ManyToOne(type => Domain)
|
50
|
-
@Field(
|
50
|
+
@Field(type => Domain)
|
51
51
|
domain?: Domain
|
52
52
|
|
53
53
|
@RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.domain)
|
@@ -203,8 +203,8 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
|
|
203
203
|
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
204
204
|
? 'enum'
|
205
205
|
: DATABASE_TYPE == 'oracle'
|
206
|
-
|
207
|
-
|
206
|
+
? 'varchar2'
|
207
|
+
: 'smallint',
|
208
208
|
enum: HistoryActionType
|
209
209
|
})
|
210
210
|
public action!: HistoryActionType
|
@@ -1,4 +1,13 @@
|
|
1
|
-
import {
|
1
|
+
import {
|
2
|
+
CreateDateColumn,
|
3
|
+
UpdateDateColumn,
|
4
|
+
Entity,
|
5
|
+
Index,
|
6
|
+
Column,
|
7
|
+
RelationId,
|
8
|
+
ManyToOne,
|
9
|
+
PrimaryGeneratedColumn
|
10
|
+
} from 'typeorm'
|
2
11
|
import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
|
3
12
|
|
4
13
|
import { Domain, ScalarObject } from '@things-factory/shell'
|
@@ -23,7 +32,11 @@ import { DataSet, DataSetSummaryPeriodType } from '../data-set/data-set'
|
|
23
32
|
],
|
24
33
|
{ unique: true }
|
25
34
|
)
|
26
|
-
@Index(
|
35
|
+
@Index(
|
36
|
+
'ix_data_summary_1',
|
37
|
+
(dataSummary: DataSummary) => [dataSummary.domain, dataSummary.dataSet, dataSummary.date, dataSummary.period],
|
38
|
+
{ unique: false }
|
39
|
+
)
|
27
40
|
@ObjectType({ description: 'Entity for DataSummary' })
|
28
41
|
export class DataSummary {
|
29
42
|
@PrimaryGeneratedColumn('uuid')
|
@@ -31,7 +44,7 @@ export class DataSummary {
|
|
31
44
|
readonly id: string
|
32
45
|
|
33
46
|
@ManyToOne(type => Domain)
|
34
|
-
@Field(
|
47
|
+
@Field(type => Domain)
|
35
48
|
domain?: Domain
|
36
49
|
|
37
50
|
@RelationId((dataSummary: DataSummary) => dataSummary.domain)
|