@things-factory/dataset 8.0.26 → 8.0.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.26",
+  "version": "8.0.28",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -56,5 +56,5 @@
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "027198de3239e511184dde702c2370a84a1a98fb"
+  "gitHead": "866d611ddc3ac6a6db283b27a896898a98bccf35"
 }

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

@@ -207,7 +207,7 @@ export class DataSetMutation {
   async deleteDataSet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await getRepository(DataSet, tx).delete({ domain: { id: domain.id }, id })
+    await getRepository(DataSet, tx).softDelete({ domain: { id: domain.id }, id })
     await deleteAttachmentsByRef(null, { refBys: [`report-${id}`] }, context)
 
     return true
@@ -219,7 +219,7 @@ export class DataSetMutation {
   async deleteDataSets(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<boolean> {
     const { domain, tx } = context.state
 
-    await getRepository(DataSet, tx).delete({
+    await getRepository(DataSet, tx).softDelete({
       domain: { id: domain.id },
       id: In(ids)
     })

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

@@ -8,6 +8,7 @@ import {
   PrimaryGeneratedColumn,
   RelationId,
   UpdateDateColumn,
+  DeleteDateColumn,
   VersionColumn
 } from 'typeorm'
 
@@ -310,6 +311,10 @@ export class DataSet {
   @Field({ nullable: true, description: 'The date and time the dataset was last updated' })
   updatedAt?: Date
 
+  @DeleteDateColumn()
+  @Field({ nullable: true, description: 'The date and time the dataset was deleted' })
+  deletedAt?: Date
+
   @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true, description: 'The user who created the dataset' })
   creator?: User

package/client/pages/data-entry/checklist-entry-page.ts

@@ -1,211 +0,0 @@
-import '@material/web/icon/icon.js'
-import '@operato/context/ox-context-page-toolbar.js'
-import '@operato/board/ox-board-viewer.js'
-
-import gql from 'graphql-tag'
-import { css, html } from 'lit'
-import { customElement, property, query, state } from 'lit/decorators.js'
-
-import { DataSample, DataSet } from '@operato/dataset'
-import { client } from '@operato/graphql'
-import { i18next, localize } from '@operato/i18n'
-import { PageView } from '@operato/shell'
-import { ScrollbarStyles } from '@operato/styles'
-
-@customElement('checklist-entry-page')
-export class ChecklistEntryPage extends localize(i18next)(PageView) {
-  static styles = [
-    ScrollbarStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        width: 100%;
-      }
-
-      div.checklist {
-        flex: 1;
-      }
-
-      .footer span {
-        font-size: 0.8em;
-        color: var(--md-sys-color-on-surface);
-        line-height: 1.5;
-        padding: 10px;
-      }
-    `
-  ]
-
-  get context() {
-    return {
-      title: i18next.t('title.checklist entry page'),
-      help: 'dataset/checklist-entry-page',
-      toolbar: false
-    }
-  }
-
-  @state() private dataSetId?: string
-  @state() private dataSet?: DataSet
-  @state() private dataSample?: DataSample | { id: string; collectedAt: Date }
-
-  render() {
-    return html`
-      <div class="checklist">
-        <table>
-          <thead>
-            <tr>
-              <th>주기</th>
-              <th>관리</th>
-              <th>점검 내용</th>
-              <th>기록</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td rowspan="3">일일 (작업전)</td>
-              <td rowspan="3">개인 위생</td>
-              <td>위생복장과 외출복장이 구분하여 보관되고 있는가?</td>
-              <td><input type="checkbox" name="check1" /></td>
-            </tr>
-            <tr>
-              <td>
-                종사자의 건강상태가 양호하고 개인장신구 등을 소지하지 않으며, 청결한 위생복장을 착용하고 작업하고
-                있는가?
-              </td>
-              <td><input type="checkbox" name="check2" /></td>
-            </tr>
-            <tr>
-              <td>위생설비(손세척기 등) 중 이상이 있는 것이 없으며, 종사자는 위생처리를 하고 입실하는가?</td>
-              <td><input type="checkbox" name="check3" /></td>
-            </tr>
-            <tr>
-              <td rowspan="2">일일 (작업전)</td>
-              <td rowspan="2">방충 방서</td>
-              <td>작업장은 밀폐가 잘 이루어지고 있으며, 방충시설(방충망 등)에는 이상이 없는가?</td>
-              <td><input type="checkbox" name="check4" /></td>
-            </tr>
-            <tr>
-              <td>파손되거나 고장 난 제조설비가 없는가?</td>
-              <td><input type="checkbox" name="check5" /></td>
-            </tr>
-            <tr>
-              <td rowspan="3">일일 (작업중)</td>
-              <td rowspan="3">공정 관리</td>
-              <td>청결구역작업과 일반구역작업이 분리되어 있으며 오염되지 않도록 관리되고 있는가?</td>
-              <td><input type="checkbox" name="check6" /></td>
-            </tr>
-            <tr>
-              <td>건조 후 냉각 공정이 적절히 관리되고 있는가? (기준: -5℃ ~ 10℃)</td>
-              <td><input type="checkbox" name="check7" /></td>
-            </tr>
-            <tr>
-              <td>완제품이 포장 상태가 양호한가?</td>
-              <td><input type="checkbox" name="check8" /></td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
-      <div class="footer">
-        <div filler></div>
-        ${!this.dataSample
-          ? html`
-              <button @click=${this.updateDataItems.bind(this)} done>
-                <md-icon>save</md-icon>${i18next.t('button.save')}
-              </button>
-            `
-          : html` <span>${i18next.t('field.collected-at')}: ${this.dataSample?.collectedAt?.toLocaleString()}</span> `}
-      </div>
-    `
-  }
-
-  pageUpdated(changes: any, lifecycle: any, before: any) {
-    if (this.active) {
-      if (this.dataSetId !== lifecycle.resourceId) {
-        this.dataSetId = lifecycle.resourceId
-        this.fetchDataSet()
-      }
-    }
-  }
-
-  async fetchDataSet() {
-    if (this.dataSetId) {
-      const response = await client.query({
-        query: gql`
-          query ($id: String!) {
-            dataSet(id: $id) {
-              id
-              name
-              description
-              useCase
-              dataItems {
-                name
-                description
-                active
-                hidden
-                tag
-                group
-                type
-                unit
-                options
-                quota
-                spec
-                stat
-              }
-            }
-          }
-        `,
-        variables: {
-          id: this.dataSetId
-        }
-      })
-
-      this.dataSet = response.data.dataSet
-    }
-  }
-
-  private async updateDataItems() {
-    //gather user entry data from inputs
-    const data = {}
-
-    const dataSample = {
-      dataSet: {
-        id: this.dataSetId
-      },
-      data
-    } as any
-
-    if (this.dataSample?.collectedAt) {
-      dataSample.collectedAt = this.dataSample.collectedAt
-    }
-
-    const response = await client.mutate({
-      mutation: gql`
-        mutation ($dataSample: NewDataSample!) {
-          createDataSample(dataSample: $dataSample) {
-            id
-            collectedAt
-          }
-        }
-      `,
-      variables: {
-        dataSample
-      },
-      context: {
-        hasUpload: true
-      }
-    })
-
-    if (!response.errors) {
-      const { id, collectedAt } = response.data.createDataSample
-      this.dataSample = {
-        id,
-        collectedAt: new Date(collectedAt)
-      }
-
-      document.dispatchEvent(
-        new CustomEvent('notify', { detail: { message: i18next.t('text.data sample created successfully') } })
-      )
-    }
-  }
-}