@dssp/project 0.0.2 → 0.0.6

package/server/service/project/project-query.ts

@@ -3,7 +3,7 @@ import { Domain, getRepository } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Project } from './project'
 import { InspectionSummary, ProjectList } from './project-type'
-import { BuildingComplex, InspectionType } from '@dssp/building-complex'
+import { BuildingComplex, InspectionStatus } from '@dssp/building-complex'
 import { Attachment } from '@things-factory/attachment-base'
 
 @Resolver(Project)
@@ -41,17 +41,14 @@ export class ProjectQuery {
   }
 
   @Query(returns => InspectionSummary, { description: '프로젝트의 검측상태 별 카운트' })
-  async inspectionSummary(
-    @Arg('projectId') projectId: string,
-    @Ctx() context: ResolverContext
-  ): Promise<InspectionSummary> {
+  async inspectionSummary(@Arg('projectId') projectId: string, @Ctx() context: ResolverContext): Promise<InspectionSummary> {
     const { domain } = context.state
 
     const queryBuilder = getRepository(Project)
       .createQueryBuilder('p')
-      .select(`COUNT(CASE WHEN bi.type="${InspectionType.REQUEST}" THEN 1 ELSE NULL END) AS request`)
-      .addSelect(`COUNT(CASE WHEN bi.type="${InspectionType.PASS}" THEN 1 ELSE NULL END) AS pass`)
-      .addSelect(`COUNT(CASE WHEN bi.type="${InspectionType.FAIL}" THEN 1 ELSE NULL END) AS fail`)
+      .select(`COUNT(CASE WHEN bi.status='${InspectionStatus.REQUEST}' THEN 1 ELSE NULL END) AS request`)
+      .addSelect(`COUNT(CASE WHEN bi.status='${InspectionStatus.PASS}' THEN 1 ELSE NULL END) AS pass`)
+      .addSelect(`COUNT(CASE WHEN bi.status='${InspectionStatus.FAIL}' THEN 1 ELSE NULL END) AS fail`)
       .innerJoin('p.buildingComplex', 'bc')
       .innerJoin('bc.buildings', 'b')
       .innerJoin('b.buildingLevels', 'bl')

package/server/service/worker-type/index.ts

@@ -0,0 +1,6 @@
+import { WorkerType } from './worker-type'
+import { WorkerTypeQuery } from './worker-type-query'
+import { WorkerTypeMutation } from './worker-type-mutation'
+
+export const entities = [WorkerType]
+export const resolvers = [WorkerTypeQuery, WorkerTypeMutation]

package/server/service/worker-type/worker-type-mutation.ts

@@ -0,0 +1,66 @@
+import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
+import { In } from 'typeorm'
+import { WorkerType } from './worker-type'
+import { WorkerTypePatch } from './worker-type-type'
+
+@Resolver(WorkerType)
+export class WorkerTypeMutation {
+  @Directive('@transaction')
+  @Mutation(returns => [WorkerType], { description: "To modify multiple WorkerTypes' information" })
+  async updateMultipleWorkerType(
+    @Arg('patches', type => [WorkerTypePatch]) patches: WorkerTypePatch[],
+    @Ctx() context: ResolverContext
+  ): Promise<WorkerType[]> {
+    const { domain, user, tx } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const workerTypeRepo = tx.getRepository(WorkerType)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await workerTypeRepo.save({
+          ...newRecord,
+          domain,
+          creator: user,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const updateRecord = _updateRecords[i]
+        const workerType = await workerTypeRepo.findOneBy({ id: updateRecord.id })
+
+        const result = await workerTypeRepo.save({
+          ...workerType,
+          ...updateRecord,
+          updater: user
+        })
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete multiple WorkerTypes' })
+  async deleteWorkerTypes(@Arg('ids', type => [String]) ids: string[], @Ctx() context: ResolverContext): Promise<boolean> {
+    const { domain, tx } = context.state
+
+    await tx.getRepository(WorkerType).softDelete({
+      domain: { id: domain.id },
+      id: In(ids)
+    })
+
+    return true
+  }
+}

package/server/service/worker-type/worker-type-query.ts

@@ -0,0 +1,47 @@
+import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx } from 'type-graphql'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import { WorkerType } from './worker-type'
+import { WorkerTypeList } from './worker-type-type'
+
+@Resolver(WorkerType)
+export class WorkerTypeQuery {
+  @Query(returns => WorkerType!, { nullable: true, description: 'To fetch a WorkerType' })
+  async workerType(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<WorkerType> {
+    const { domain } = context.state
+
+    return await getRepository(WorkerType).findOne({
+      where: { domain: { id: domain.id }, id }
+    })
+  }
+
+  @Query(returns => WorkerTypeList, { description: 'To fetch multiple WorkerTypes' })
+  async workerTypes(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<WorkerTypeList> {
+    const { domain } = context.state
+
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: await getRepository(WorkerType)
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
+    return { items, total }
+  }
+
+  @FieldResolver(type => Domain)
+  async domain(@Root() workerType: WorkerType): Promise<Domain> {
+    return await getRepository(Domain).findOneBy({ id: workerType.domainId })
+  }
+
+  @FieldResolver(type => User)
+  async updater(@Root() workerType: WorkerType): Promise<User> {
+    return await getRepository(User).findOneBy({ id: workerType.updaterId })
+  }
+
+  @FieldResolver(type => User)
+  async creator(@Root() workerType: WorkerType): Promise<User> {
+    return await getRepository(User).findOneBy({ id: workerType.creatorId })
+  }
+}

package/server/service/worker-type/worker-type-type.ts

@@ -0,0 +1,26 @@
+import { ObjectType, Field, InputType, Int, ID } from 'type-graphql'
+import { WorkerType } from './worker-type'
+
+@InputType()
+export class WorkerTypePatch {
+  @Field(type => ID, { nullable: true })
+  id?: string
+
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field()
+  cuFlag: string
+}
+
+@ObjectType()
+export class WorkerTypeList {
+  @Field(type => [WorkerType])
+  items: WorkerType[]
+
+  @Field(type => Int)
+  total: number
+}

package/server/service/worker-type/worker-type.ts

@@ -0,0 +1,68 @@
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn
+} from 'typeorm'
+import { ObjectType, Field, ID } from 'type-graphql'
+
+import { Domain } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+
+@Entity()
+@Index('ix_worker_type_0', (workerType: WorkerType) => [workerType.domain, workerType.name], {
+  unique: true,
+  where: '"deleted_at" IS NULL'
+})
+@ObjectType({ description: '작업자 타입' })
+export class WorkerType {
+  @PrimaryGeneratedColumn('uuid')
+  @Field(type => ID)
+  readonly id: string
+
+  @ManyToOne(type => Domain)
+  @Field({ nullable: true })
+  domain?: Domain
+
+  @RelationId((workerType: WorkerType) => workerType.domain)
+  domainId?: string
+
+  @Column({ nullable: false, comment: '타입 이름' })
+  @Field({ nullable: false })
+  name: string
+
+  @Column({ nullable: true, comment: '설명' })
+  @Field({ nullable: true })
+  description?: string
+
+  @CreateDateColumn()
+  @Field({ nullable: true })
+  createdAt?: Date
+
+  @UpdateDateColumn()
+  @Field({ nullable: true })
+  updatedAt?: Date
+
+  @DeleteDateColumn()
+  @Field({ nullable: true })
+  deletedAt?: Date
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  creator?: User
+
+  @RelationId((workerType: WorkerType) => workerType.creator)
+  creatorId?: string
+
+  @ManyToOne(type => User, { nullable: true })
+  @Field(type => User, { nullable: true })
+  updater?: User
+
+  @RelationId((workerType: WorkerType) => workerType.updater)
+  updaterId?: string
+}

package/things-factory.config.js

@@ -11,6 +11,9 @@ export default {
     'project-setting-list', // 셋팅 리스트
     'project-update', // 프로젝트 정보 관리
     'project-plan-management', // 프로젝트 도면 관리
+    'manager-management', // 담당자 관리
+    'worker-type-management', // 인력 관리
+    'construction-type-management', // 공종 관리
   ].map(page => {
     return {
       page,

package/client/pages/project/ox-progress-circle.ts

@@ -1,133 +0,0 @@
-/**
- * @license Copyright © HatioLab Inc. All rights reserved.
- */
-
-import { PropertyValues, LitElement, css, html } from 'lit'
-import { customElement, property, query } from 'lit/decorators.js'
-import { ScrollbarStyles } from '@operato/styles'
-
-/**
-WEB Component for code-mirror code editor.
-
-Example:
-  <ox-progress-circle
-    .value=${70}
-    titleText="전체"
-    suffix="%"
-    fontSize="29px"
-    fontColor="#4E5055"
-    borderStyle="none"
-    innerCircleSize="28%"
-    circleColor="#0595E5"
-    shadow="#00000026 4px 4px 4px"
-    background="#eaf5fd"
-  ></ox-progress-circle>
-*/
-@customElement('ox-progress-circle')
-export class OxProgressCircle extends LitElement {
-  static styles = [
-    ScrollbarStyles,
-    css`
-      :host {
-        display: flex;
-      }
-
-      div[circle] {
-        font-size: 29px;
-        font-weight: bold;
-        width: 100%;
-        aspect-ratio: 1;
-        display: flex;
-        border-radius: 50%;
-        border: 1px solid #353b48;
-        position: relative;
-        background: conic-gradient(yellowgreen 0deg, white 0deg);
-        box-shadow: #00000026 5px 5px 5px;
-      }
-      div[inner-circle] {
-        width: 90%;
-        aspect-ratio: 1;
-        border-radius: inherit;
-        background-color: #353b48;
-        margin: auto;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        color: white;
-        justify-content: center;
-        box-shadow: inset #00000026 -2px 2px 8px;
-      }
-
-      div[inner-circle] span {
-        display: flex;
-        align-items: center;
-      }
-
-      span[progress-title] {
-        font-size: 0.65em;
-        margin-bottom: -5%;
-      }
-    `
-  ]
-
-  @property({ type: Number }) value: number = 0
-  @property({ type: String }) suffix: string = ''
-  @property({ type: String }) titleText: string = ''
-  @property({ type: String }) fontSize: string = '10px'
-  @property({ type: String }) fontColor: string = ''
-  @property({ type: String }) borderStyle: string = ''
-  @property({ type: String }) innerCircleSize: string = '10%'
-  @property({ type: String }) shadow: string = ''
-  @property({ type: String }) circleColor: string = 'yellowgreen'
-  @property({ type: String }) background: string = ''
-
-  @query('div[circle]') circle!: HTMLDivElement
-  @query('div[inner-circle]') innerCircle!: HTMLDivElement
-  @query('span[progress-title]') progressTitle?: HTMLSpanElement
-
-  firstUpdated() {
-    if (this.fontSize) {
-      this.circle.style.fontSize = this.fontSize
-    }
-    if (this.fontColor) {
-      this.innerCircle.style.color = this.fontColor
-    }
-    if (this.borderStyle) {
-      this.circle.style.border = this.borderStyle
-    }
-    if (this.innerCircleSize) {
-      this.innerCircle.style.width = `calc(100% - ${this.innerCircleSize})`
-    }
-    if (this.shadow) {
-      this.circle.style.boxShadow = this.shadow
-    }
-    if (this.background) {
-      this.innerCircle.style.background = this.background
-    }
-    if (this.progressTitle && this.circleColor) {
-      this.progressTitle.style.color = this.circleColor
-    }
-  }
-
-  updated(changes: PropertyValues<this>) {
-    if (changes.has('value')) {
-      this.updateCircleBackground()
-    }
-  }
-
-  updateCircleBackground() {
-    const position = this.value * 3.6 // 360 = 100%
-    this.circle.style.background = `conic-gradient(${this.circleColor} ${position}deg, ${this.background} 0deg)`
-  }
-
-  render() {
-    return html`
-      <div circle>
-        <div inner-circle>
-          ${this.titleText ? html`<span progress-title>${this.titleText}</span>` : ''}
-          <span>${this.value}${this.suffix}</span>
-        </div>
-      </div>
-    `
-  }
-}

package/client/pages/resource/resource-importer.ts

@@ -1,96 +0,0 @@
-import '@operato/data-grist'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-import { property, state } from 'lit/decorators.js'
-
-import { client } from '@operato/graphql'
-import { i18next } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-
-export class ResourceImporter extends LitElement {
-  static styles = [
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: #fff;
-      }
-
-      ox-grist {
-        flex: 1;
-      }
-
-      .button-container {
-        display: flex;
-        margin-left: auto;
-        padding: var(--padding-default);
-      }
-
-      mwc-button {
-        margin-left: var(--margin-default);
-      }
-    `
-  ]
-
-  @state() private resources: any[] = []
-  @state() private columns = {
-    list: { fields: ['name', 'description'] },
-    pagination: { infinite: true },
-    columns: [
-      {
-        type: 'string',
-        name: 'name',
-        header: i18next.t('field.name'),
-        width: 150
-      },
-      {
-        type: 'string',
-        name: 'description',
-        header: i18next.t('field.description'),
-        width: 200
-      },
-      {
-        type: 'checkbox',
-        name: 'active',
-        header: i18next.t('field.active'),
-        width: 60
-      }
-    ]
-  }
-
-  render() {
-    return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data=${
-          { 
-            records: this.resources 
-          }
-        }
-      ></ox-grist>
-
-      <div class="button-container">
-        <mwc-button raised @click="${this.save.bind(this)}">${i18next.t('button.save')}</mwc-button>
-      </div>
-    `
-  }
-
-  private async save() {
-    const response = await client.mutate({
-      mutation: gql`
-        mutation importResources($resources: [ResourcePatch!]!) {
-          importResources(resources: $resources)
-        }
-      `,
-      variables: { resources: this.resources }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-