@things-factory/dataset 5.0.0-alpha.32 → 5.0.0-alpha.35

package/server/controllers/create-data-sample.ts

@@ -77,19 +77,21 @@ export async function createDataSample(
   }, {})
 
   const collectedAt = dataSample.collectedAt || new Date()
-  // workDate ex) 2022-04-04
-  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt)
 
-  const dateFormat = 'YYYY-MM-DD'
+  const timezone = dataSet.timezone || domain.timezone || 'UTC'
+  const format = 'YYYY-MM-DD'
+
+  // workDate ex) 2022-04-04
+  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })
+  
   // local time dataSet timezone or domain timezone or default 'UTC'
-  const timezone = dataSet['timezone'] || domain['timezone'] || 'UTC'
   
   // const collectedAt = dataSample.collectedAt || new Date()
   const localDateTz = moment(collectedAt).tz(timezone)
   const defaultPartitionKeys = {
     domain: domain.subdomain,
     datasetid: dataSample.dataSet.id, /* It should not be 'data_set_id' as column name duplicated for Glue */
-    date: localDateTz.format(dateFormat), /* local time date */
+    date: localDateTz.format(format), /* local time date */
     workdate: workDate, /* working date */
     workshift: workShift
   }

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

@@ -39,6 +39,25 @@ export class DataSetQuery {
   async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
     const { domain } = context.state
 
+    /* TODO. 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
+
+    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
+    where.active = Equal(true)
+
+    const [items, total] = await getRepository(DataSet).findAndCount({
+      where,
+      order,
+      skip,
+      take
+    })
+
+    return { items, total }
+  }
+
+  @Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
+  async dataSetsForReport(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
+    const { domain } = context.state
+
     /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
 
     const { where = {}, order, skip, take } = convertListParams(params, domain.id)
@@ -61,6 +80,13 @@ export class DataSetQuery {
     })
   }
 
+  @FieldResolver(type => Role)
+  async entryRole(@Root() dataSet: DataSet): Promise<Role> {
+    return await getRepository(Role).findOne({
+      id: dataSet.entryRoleId
+    })
+  }
+
   @FieldResolver(type => Role)
   async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
     return await getRepository(Role).findOne({
@@ -110,14 +136,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domain, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || domain.timezone || 'UTC'
     })
 
     return interval.next().toDate()
@@ -125,14 +151,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { timezone, schedule } = dataSet
+    const { domain, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone
+      tz: timezone || domain.timezone || 'UTC'
     })
 
     return interval.prev().toDate()

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/things-factory.config.js

@@ -23,6 +23,10 @@ export default {
     {
       tagname: 'data-entry-list-page',
       page: 'data-entry-list'
+    },
+    {
+      tagname: 'data-report-list-page',
+      page: 'data-report-list'
     }
   ],
   bootstrap

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",
@@ -35,15 +38,26 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "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": "상태",
@@ -35,14 +38,25 @@
   "field.use-case": "사용 사례",
   "field.work-date": "작업기준일",
   "field.work-shift": "교대근무조",
+  "label.acceptables": "허용값",
+  "label.critical limits": "허용 한계범위",
+  "label.minimum value": "최소값",
+  "label.maximum value": "최대값",
+  "label.pass limits": "통과 허용범위",
+  "label.target limits": "관리 목표범위",
+  "text.automatically collected": "자동 수집",
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "text.data ooc updated successfully": "이탈데이타 내용이 수정되었습니다",
+  "text.manually collected": "수동 수집",
   "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",
@@ -35,14 +38,25 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "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": "状态",
@@ -35,14 +38,25 @@
   "field.use-case": "use case",
   "field.work-date": "work date",
   "field.work-shift": "work shift",
+  "label.acceptables": "acceptables",
+  "label.critical limits": "critical limits",
+  "label.minimum value": "minimum value",
+  "label.maximum value": "maximum value",
+  "label.pass limits": "pass limits",
+  "label.target limits": "target limits",
+  "text.automatically collected": "automatically collected",
   "text.data sample created successfully": "a data sample created successfully",
   "text.data ooc updated successfully": "a data ooc updated successfully",
+  "text.manually collected": "manually collected",
   "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/yarn-error.log

@@ -1176,7 +1176,7 @@ Lockfile:
       "@babel/types" "^7.17.0"
       convert-source-map "^1.7.0"
       debug "^4.1.0"
-      gensync "^1.0.0-beta.2"
+      gensync "^1.0.0-beta.3"
       json5 "^2.1.2"
       semver "^6.3.0"
   
@@ -11884,9 +11884,9 @@ Lockfile:
     resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.8.2.tgz#aab4f280adb522fdfbdc5e5b64d718d3683f04e9"
     integrity sha512-nGToKy6p3PAbYQ7p1UlWl6vSPwfwU6TMSWK7TTu+WUY4ZjyZQGniGGt2oNVvyNSpyZYSB43zMXVLcBm08MTMkg==
   
-  gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
-    version "1.0.0-beta.2"
-    resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.3:
+    version "1.0.0-beta.3"
+    resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.3.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
     integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
   
   get-caller-file@^1.0.1: