@things-factory/dataset 5.0.0-alpha.30 → 5.0.0-alpha.33

package/server/service/data-set/data-set-type.ts

@@ -2,7 +2,7 @@ import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
-import { DataSet, DataSetViewType } from './data-set'
+import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from './data-set'
 
 @InputType()
 export class NewDataSet {
@@ -12,6 +12,9 @@ export class NewDataSet {
   @Field({ nullable: true })
   description?: string
 
+  @Field(type => ObjectRef, { nullable: true })
+  entryRole?: ObjectRef
+
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
@@ -34,16 +37,22 @@ export class NewDataSet {
   timezone?: string
 
   @Field({ nullable: true })
-  entryType?: DataSetViewType
+  entryType?: DataSetEntryType
 
   @Field({ nullable: true })
   entryView?: string
 
   @Field({ nullable: true })
-  monitorType?: DataSetViewType
+  monitorType?: DataSetMonitorType
 
   @Field({ nullable: true })
   monitorView?: string
+
+  @Field({ nullable: true })
+  reportType?: DataSetReportType
+
+  @Field({ nullable: true })
+  reportView?: string
 }
 
 @InputType()
@@ -60,6 +69,9 @@ export class DataSetPatch {
   @Field(type => ObjectRef, { nullable: true })
   supervisoryRole?: ObjectRef
 
+  @Field(type => ObjectRef, { nullable: true })
+  entryRole?: ObjectRef
+
   @Field({ nullable: true })
   active?: boolean
 
@@ -76,17 +88,23 @@ export class DataSetPatch {
   timezone?: string
 
   @Field({ nullable: true })
-  entryType?: DataSetViewType
+  entryType?: DataSetEntryType
 
   @Field({ nullable: true })
   entryView?: string
 
   @Field({ nullable: true })
-  monitorType?: DataSetViewType
+  monitorType?: DataSetMonitorType
 
   @Field({ nullable: true })
   monitorView?: string
 
+  @Field({ nullable: true })
+  reportType?: DataSetReportType
+
+  @Field({ nullable: true })
+  reportView?: string
+
   @Field()
   cuFlag: string
 }

package/server/service/data-set/data-set.ts

@@ -16,16 +16,40 @@ import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
 
-export enum DataSetViewType {
+export enum DataSetEntryType {
   Generated = 'generated',
   Board = 'board',
   Page = 'page',
   ExternalURL = 'external'
 }
 
-registerEnumType(DataSetViewType, {
-  name: 'DataSetViewType',
-  description: 'view type enumeration for data-set'
+registerEnumType(DataSetEntryType, {
+  name: 'DataSetEntryType',
+  description: 'entry type enumeration for data-set'
+})
+
+export enum DataSetMonitorType {
+  Generated = 'generated',
+  Board = 'board',
+  Page = 'page',
+  ExternalURL = 'external'
+}
+
+registerEnumType(DataSetMonitorType, {
+  name: 'DataSetMonitorType',
+  description: 'monitor type enumeration for data-set'
+})
+
+export enum DataSetReportType {
+  Generated = 'generated',
+  Board = 'board',
+  Page = 'page',
+  ExternalURL = 'external'
+}
+
+registerEnumType(DataSetReportType, {
+  name: 'DataSetReportType',
+  description: 'report type enumeration for data-set'
 })
 
 @Entity()
@@ -59,6 +83,15 @@ export class DataSet {
   @Field({ nullable: true })
   active?: boolean
 
+  @ManyToOne(type => Role, {
+    nullable: true
+  })
+  @Field(type => Role, { nullable: true })
+  entryRole?: Role
+
+  @RelationId((dataSet: DataSet) => dataSet.entryRole)
+  entryRoleId?: string
+
   @ManyToOne(type => Role, {
     nullable: true
   })
@@ -78,7 +111,7 @@ export class DataSet {
     nullable: true
   })
   @Field({ nullable: true })
-  entryType?: DataSetViewType
+  entryType?: DataSetEntryType
 
   @Column({
     nullable: true
@@ -90,7 +123,7 @@ export class DataSet {
     nullable: true
   })
   @Field({ nullable: true })
-  monitorType?: DataSetViewType
+  monitorType?: DataSetMonitorType
 
   @Column({
     nullable: true
@@ -98,6 +131,18 @@ export class DataSet {
   @Field({ nullable: true })
   monitorView?: string
 
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  reportType?: DataSetReportType
+
+  @Column({
+    nullable: true
+  })
+  @Field({ nullable: true })
+  reportView?: string
+
   @Column({
     nullable: true
   })

package/translations/en.json

@@ -10,6 +10,7 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
   "field.hidden": "hidden",
@@ -26,6 +27,8 @@
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
+  "field.report-type": "report type",
+  "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.state": "state",
@@ -40,10 +43,13 @@
   "title.data-entry-form": "data entry form",
   "title.data-entry list": "data entry list",
   "title.data-item list": "data item list",
+  "title.data-monitor-view": "data monitor view",
+  "title.data-report-view": "data report view",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
-  "title.data-set list": "data set list"
-}
+  "title.data-set list": "data set list",
+  "title.edit code": "edit code"
+}

package/translations/ko.json

@@ -10,6 +10,7 @@
   "field.data-sample": "데이타 샘플",
   "field.data-set": "데이타셋",
   "field.device-id": "디바이스 아이디",
+  "field.entry-role": "입력담당 역할",
   "field.entry-type": "입력용 화면종류",
   "field.entry-view": "입력용 화면",
   "field.hidden": "숨기기",
@@ -26,6 +27,8 @@
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
+  "field.report-type": "리포트용 화면종류",
+  "field.report-view": "리포트용 화면",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
   "field.state": "상태",
@@ -39,10 +42,13 @@
   "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
   "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
+  "title.data-monitor-view": "데이타 모니터",
+  "title.data-report-view": "데이타 리포트",
   "title.data-ooc list": "데이타 이탈점 조회",
   "title.data-ooc view": "데이타 이탈점 상세",
   "title.data-sample list": "데이타 샘플 조회",
   "title.data-sample view": "데이타 샘플 상세",
   "title.data-sensor list": "데이타 센서 조회",
-  "title.data-set list": "데이타 셋 조회"
-}
+  "title.data-set list": "데이타 셋 조회",
+  "title.edit code": "코드 편집"
+}

package/translations/ms.json

@@ -10,6 +10,7 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
   "field.latest-collected-at": "latest collected at",
@@ -26,6 +27,8 @@
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
+  "field.report-type": "report type",
+  "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.state": "keadaan",
@@ -39,10 +42,13 @@
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-monitor-view": "data monitor view",
+  "title.data-report-view": "data report view",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
-  "title.data-set list": "data set list"
-}
+  "title.data-set list": "data set list",
+  "title.edit code": "edit code"
+}

package/translations/zh.json

@@ -10,6 +10,7 @@
   "field.data-sample": "data sample",
   "field.data-set": "data set",
   "field.device-id": "device id",
+  "field.entry-role": "entry role",
   "field.entry-type": "entry type",
   "field.entry-view": "entry view",
   "field.hidden": "hidden",
@@ -26,6 +27,8 @@
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
+  "field.report-type": "report type",
+  "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
   "field.state": "状态",
@@ -39,10 +42,13 @@
   "text.data ooc updated successfully": "a data ooc updated successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-monitor-view": "data monitor view",
+  "title.data-report-view": "data report view",
   "title.data-ooc list": "data OOC list",
   "title.data-ooc view": "data OOC view",
   "title.data-sample list": "data sample list",
   "title.data-sample view": "data sample view",
   "title.data-sensor list": "data sensor list",
-  "title.data-set list": "data set list"
-}
+  "title.data-set list": "data set list",
+  "title.edit code": "edit code"
+}