@dssp/project 1.0.0-alpha.0 → 1.0.0-alpha.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dssp/project",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.100",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,16 +27,20 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@dssp/building-complex": "^1.0.0-alpha.0",
-    "@operato/graphql": "^8.0.0-beta",
-    "@operato/shell": "^8.0.0-beta",
-    "@things-factory/auth-base": "^8.0.0-beta",
-    "@things-factory/contact": "^8.0.0-beta",
-    "@things-factory/integration-headless": "^8.0.0-beta",
-    "@things-factory/integration-ui": "^8.0.0-beta",
-    "@things-factory/organization": "^8.0.0-beta",
-    "@things-factory/shell": "^8.0.0-beta",
+    "@dssp/building-complex": "^1.0.0-alpha.84",
+    "@dssp/supervision": "^1.0.0-alpha.100",
+    "@operato/graphql": "^10.0.0-beta",
+    "@operato/shell": "^10.0.0-beta",
+    "@things-factory/auth-base": "^10.0.0-beta",
+    "@things-factory/contact": "^10.0.0-beta",
+    "@things-factory/env": "^10.0.0-beta",
+    "@things-factory/integration-headless": "^10.0.0-beta",
+    "@things-factory/integration-ui": "^10.0.0-beta",
+    "@things-factory/kpi": "^10.0.0-beta",
+    "@things-factory/organization": "^10.0.0-beta",
+    "@things-factory/shell": "^10.0.0-beta",
+    "archiver": "^7.0.0",
     "exceljs": "^4.4.0"
   },
-  "gitHead": "7b8b1a1ab63177487b30c0acb7f2cbc82afe6a0e"
+  "gitHead": "0fc78c632831e0bd9fd16c1ac8bc15588e14e816"
 }

package/things-factory.config.js

@@ -6,14 +6,14 @@ export default {
     'project-list', // 진행중 리스트
     'project-detail', // 진행중 프로젝트 상세 정보
     'project-completed-list', // 완료 리스트
-    'project-schedule-list', // 스케줄(공정표) 리스트
-    'project-schedule', // 스케줄(공정표)
+    'project-task-list', // 스케줄(공정표) 리스트
+    'project-task', // 스케줄(공정표)
     'project-setting-list', // 셋팅 리스트
     'project-update', // 프로젝트 정보 관리
     'project-plan-management', // 프로젝트 도면 관리
     'worker-type-management', // 인력 관리
     'construction-type-management', // 공종 관리
-    'inspection-drawing-type-management', // 도면 타입 및 검측 부위 관리
+    'inspection-drawing-type-management' // 도면 타입 및 검측 부위 관리
   ].map(page => {
     return {
       page,

package/translations/en.json

@@ -1,15 +1,16 @@
 {
-  "label.gantt-task-id": "아이디",
-  "label.gantt-task-section": "섹션",
-  "label.gantt-task-title": "제목",
-  "label.gantt-task-type": "유형",
+  "button.project_create": "프로젝트 생성",
+  "field.start-date": "시작 날짜",
+  "field.end-date": "종료 날짜",
+  "label.gantt-task-title": "작업명",
   "label.gantt-task-start-date": "시작 날짜",
-  "label.gantt-task-end-date": "종료 날짜",
-  "label.gantt-task-tags": "태그",
-  "label.gantt-task-progress": "진행 상황",
-  "label.gantt-task-previous": "이전",
   "label.gantt-task-resources": "자원",
   "label.gantt-task-duration": "기간",
   "label.gantt-resource-type": "유형",
-  "label.gantt-resource-allocated": "할당"
+  "label.gantt-resource-allocated": "할당",
+  "label.project_name": "프로젝트 이름",
+  "title.lookup project": "프로젝트 조회",
+  "title.project_create": "프로젝트 생성",
+  "title.project_update": "프로젝트 수정",
+  "title.project_setting_list": "프로젝트 설정 리스트"
 }

package/translations/ja.json

@@ -1 +1,15 @@
-{}
+{
+  "button.project_create": "프로젝트 생성",
+  "field.start-date": "시작 날짜",
+  "field.end-date": "종료 날짜",
+  "label.gantt-task-title": "작업명",
+  "label.gantt-task-start-date": "시작 날짜",
+  "label.gantt-task-resources": "자원",
+  "label.gantt-task-duration": "기간",
+  "label.gantt-resource-type": "유형",
+  "label.gantt-resource-allocated": "할당",
+  "label.project_name": "프로젝트 이름",
+  "title.project_create": "프로젝트 생성",
+  "title.project_update": "프로젝트 수정",
+  "title.project_setting_list": "프로젝트 설정 리스트"
+}

package/translations/ko.json

@@ -1,5 +1,7 @@
 {
   "button.project_create": "프로젝트 생성",
+  "field.start-date": "시작 날짜",
+  "field.end-date": "종료 날짜",
   "label.gantt-task-title": "작업명",
   "label.gantt-task-start-date": "시작 날짜",
   "label.gantt-task-resources": "자원",
@@ -7,6 +9,7 @@
   "label.gantt-resource-type": "유형",
   "label.gantt-resource-allocated": "할당",
   "label.project_name": "프로젝트 이름",
+  "title.lookup project": "프로젝트 조회",
   "title.project_create": "프로젝트 생성",
   "title.project_update": "프로젝트 수정",
   "title.project_setting_list": "프로젝트 설정 리스트"

package/translations/ms.json

@@ -1 +1,15 @@
-{}
+{
+  "button.project_create": "프로젝트 생성",
+  "field.start-date": "시작 날짜",
+  "field.end-date": "종료 날짜",
+  "label.gantt-task-title": "작업명",
+  "label.gantt-task-start-date": "시작 날짜",
+  "label.gantt-task-resources": "자원",
+  "label.gantt-task-duration": "기간",
+  "label.gantt-resource-type": "유형",
+  "label.gantt-resource-allocated": "할당",
+  "label.project_name": "프로젝트 이름",
+  "title.project_create": "프로젝트 생성",
+  "title.project_update": "프로젝트 수정",
+  "title.project_setting_list": "프로젝트 설정 리스트"
+}

package/translations/zh.json

@@ -1 +1,15 @@
-{}
+{
+  "button.project_create": "프로젝트 생성",
+  "field.start-date": "시작 날짜",
+  "field.end-date": "종료 날짜",
+  "label.gantt-task-title": "작업명",
+  "label.gantt-task-start-date": "시작 날짜",
+  "label.gantt-task-resources": "자원",
+  "label.gantt-task-duration": "기간",
+  "label.gantt-resource-type": "유형",
+  "label.gantt-resource-allocated": "할당",
+  "label.project_name": "프로젝트 이름",
+  "title.project_create": "프로젝트 생성",
+  "title.project_update": "프로젝트 수정",
+  "title.project_setting_list": "프로젝트 설정 리스트"
+}

package/client/pages/lib/select2-component.ts

@@ -1,175 +0,0 @@
-import { LitElement, html, css } from 'lit'
-import { customElement, property, state } from 'lit/decorators.js'
-
-@customElement('select2-component')
-export class Select2Component extends LitElement {
-  static styles = css`
-    div[select-container] {
-      position: relative;
-      border: 1px solid rgba(51,51,51,.20);
-      border-radius: 5px;
-      padding: var(--spacing-small, 4px) var(--spacing-medium, 8px);
-      font-size: 14px;
-      color: var(--md-sys-color-primary);
-    }
-    div[select-container]:focus {
-      border: 1px solid #1f7fd9;
-    }
-
-    div[dropdown] {
-      border: 1px solid #ccc;
-      padding: var(--spacing-small, 4px);
-      cursor: pointer;
-    }
-
-    div[options] {
-      position: absolute;
-      left: 0;
-      top: 30px;
-      min-width: 50%;
-      border: 1px solid #ccc;
-      background-color: var(--md-sys-color-surface-tint);
-      color:var(--md-sys-color-on-primary);
-      max-height: 150px;
-      overflow-y: auto;
-      display: block;
-      z-index: 1;
-    }
-
-    div[option] {
-      padding: var(--spacing-small, 4px) var(--spacing-medium, 8px);
-      cursor: pointer;
-      border-bottom: 1px solid rgba(0,0,0,.4);
-    }
-    div[option]:last-child {
-      border-bottom: none;
-    }
-
-    div[option]:hover {
-      background-color: var(--md-sys-color-tertiary-container);
-    }
-
-    div[option][selected] {
-      background-color: var(--md-sys-color-tertiary-container);
-      font-weight: bold;
-      color:var(--md-sys-color-on-primary);
-    }
-
-    div[selected-tags] {
-      display: flex;
-      flex-wrap: wrap;
-      gap: var(--spacing-small, 4px);
-      margin-top: var(--spacing-small, 4px);
-    }
-
-    div[tag] {
-      background-color: #2e79be;
-      color: white;
-      padding: var(--spacing-tiny, 2px) var(--spacing-medium, 8px);
-      border-radius: 20px;
-      font-size: 12px;
-      display: inline-flex;
-      align-items: center;
-      cursor: pointer;
-    }
-
-    span[tag-close] {
-      margin-left: var(--spacing-small, 4px);
-    }
-  `
-
-  @property({ type: String }) placeholder: string = ''
-  @property({ type: Array }) options: Array<{ name: string; value: string }> = []
-  @property({ type: Array }) selectedValues: string[] = []
-
-  @state() showOptions: boolean = false
-
-  get selectedItems() {
-    return this.selectedValues.map(id => this.options.find(option => option.value === id)).filter(Boolean)
-  }
-
-  connectedCallback() {
-    super.connectedCallback()
-    document.addEventListener('click', this._handleOutsideClick)
-  }
-
-  disconnectedCallback() {
-    super.disconnectedCallback()
-    document.removeEventListener('click', this._handleOutsideClick)
-  }
-
-  private _handleOutsideClick = (event: MouseEvent) => {
-    const path = event.composedPath()
-    if (!path.includes(this)) {
-      this.showOptions = false
-    }
-  }
-
-  private _toggleOptions() {
-    this.showOptions = !this.showOptions
-  }
-
-  private _handleSelect(optionValue: string) {
-    if (this.selectedValues.includes(optionValue)) {
-      // 이미 선택된 옵션을 선택한 경우 해제
-      this.selectedValues = this.selectedValues.filter(value => value !== optionValue)
-    } else {
-      // 선택되지 않은 옵션 추가
-      this.selectedValues = [...this.selectedValues, optionValue]
-    }
-
-    this.showOptions = false
-    this._dispatchEvent(this.selectedValues)
-  }
-
-  private _handleRemove(tagValue: string) {
-    this.selectedValues = this.selectedValues.filter(value => value !== tagValue)
-    this._dispatchEvent(this.selectedValues)
-  }
-
-  private _dispatchEvent(selectedValues: string[]) {
-    this.dispatchEvent(
-      new CustomEvent('selection-changed', {
-        detail: { selectedValues }, // ID 배열을 부모로 전달
-        bubbles: true,
-        composed: true
-      })
-    )
-  }
-
-  render() {
-    return html`
-      <div select-container>
-        <div tags @click="${this._toggleOptions}">${this.placeholder}</div>
-        ${this.showOptions
-          ? html`
-              <div options>
-                ${this.options.map(
-                  option => html`
-                    <div
-                      option
-                      ?selected=${this.selectedValues.includes(option.value)}
-                      @click=${() => this._handleSelect(option.value)}
-                    >
-                      ${option.name}
-                    </div>
-                  `
-                )}
-              </div>
-            `
-          : ''}
-      </div>
-
-      <div selected-tags>
-        ${this.selectedItems.map(
-          (tag: any) => html`
-            <div tag @click=${() => this._handleRemove(tag.value)}>
-              ${tag!.name}
-              <span tag-close>&times;</span>
-            </div>
-          `
-        )}
-      </div>
-    `
-  }
-}

package/client/pages/lib/waether.ts

@@ -1,159 +0,0 @@
-const API_KEY = '9epdR01s19phfu%2B3%2F0elTxTi92Nibl3qEO1HSm2QydrWOlrDqyNn9qzeQRJ3jPOh3hV8TesHg1L%2BQ9D6UOPmWQ%3D%3D'
-const URL = 'https://apis.data.go.kr/1360000/VilageFcstInfoService_2.0/getVilageFcst'
-const NUM_OF_ROWS = 12
-const DATA_TYPE = 'JSON'
-
-export default async function _getWeather(latitude: number, longitude: number) {
-  const { nx, ny } = _getIndexByLatAndLong(latitude, longitude)
-  const { base_date, base_time } = _getTodayAndHour()
-  const result = await fetch(
-    `${URL}?serviceKey=${API_KEY}&base_date=${base_date}&base_time=${base_time}&nx=${nx}&ny=${ny}&pageNo=1&numOfRows=${NUM_OF_ROWS}&dataType=${DATA_TYPE}`
-  )
-
-  let rain = 0
-  let temperature = 0
-  let humidity = 0
-  let wind = ''
-
-  if (result.status == 200) {
-    let weather = await result.json().then(data => data?.response?.body)
-    weather = weather?.items?.item
-
-    for (let key in weather) {
-      const data = weather?.[key] || {}
-
-      if (data.category === 'POP') {
-        rain = data.fcstValue
-      }
-      if (data.category === 'REH') {
-        humidity = data.fcstValue
-      }
-      if (data.category === 'TMP') {
-        temperature = data.fcstValue
-      }
-      if (data.category === 'VEC') {
-        wind = _getWindDirectionByValue(data.fcstValue)
-      }
-    }
-
-    console.log('weather :', weather)
-  }
-
-  return { rain, temperature, humidity, wind }
-}
-
-const RE = 6371.00877 // 지구 반경(km)
-const GRID = 5.0 // 격자 간격(km)
-const SLAT1 = 30.0 // 투영 위도1(degree)
-const SLAT2 = 60.0 // 투영 위도2(degree)
-const OLON = 126.0 // 기준점 경도(degree)
-const OLAT = 38.0 // 기준점 위도(degree)
-const XO = 43 // 기준점 X좌표(GRID)
-const YO = 136 // 기1준점 Y좌표(GRID)
-
-// 위경도 -> 기상청 좌표
-function _getIndexByLatAndLong(latitude: number, longitude: number) {
-  const DEGRAD = Math.PI / 180.0
-  const re = RE / GRID
-  const slat1 = SLAT1 * DEGRAD
-  const slat2 = SLAT2 * DEGRAD
-  const olon = OLON * DEGRAD
-  const olat = OLAT * DEGRAD
-
-  let sn = Math.tan(Math.PI * 0.25 + slat2 * 0.5) / Math.tan(Math.PI * 0.25 + slat1 * 0.5)
-  sn = Math.log(Math.cos(slat1) / Math.cos(slat2)) / Math.log(sn)
-  let sf = Math.tan(Math.PI * 0.25 + slat1 * 0.5)
-  sf = (Math.pow(sf, sn) * Math.cos(slat1)) / sn
-  let ro = Math.tan(Math.PI * 0.25 + olat * 0.5)
-  ro = (re * sf) / Math.pow(ro, sn)
-  let ra = Math.tan(Math.PI * 0.25 + latitude * DEGRAD * 0.5)
-  ra = (re * sf) / Math.pow(ra, sn)
-  let theta = longitude * DEGRAD - olon
-  if (theta > Math.PI) theta -= 2.0 * Math.PI
-  if (theta < -Math.PI) theta += 2.0 * Math.PI
-  theta *= sn
-
-  return {
-    nx: Math.floor(ra * Math.sin(theta) + XO + 0.5),
-    ny: Math.floor(ro - ra * Math.cos(theta) + YO + 0.5),
-    latitude,
-    longitude
-  }
-}
-
-function _getTodayAndHour() {
-  const now = new Date()
-  const todayDate = now.toISOString().slice(0, 10).replace(/-/g, '')
-  const yesterday = new Date(now)
-  yesterday.setDate(yesterday.getDate() - 1)
-  const yesterdayDate = yesterday.toISOString().slice(0, 10).replace(/-/g, '')
-
-  // 1일 총 8번 데이터가 업데이트 된다. (0200, 0500, 0800, 1100, 1400, 1700, 2000, 2300)
-  let base_date
-  let base_time
-
-  if (now.getHours() < 2 || (now.getHours() === 2 && now.getMinutes() <= 10)) {
-    base_date = yesterdayDate
-    base_time = '2300'
-  } else if (now.getHours() < 5 || (now.getHours() === 5 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '0200'
-  } else if (now.getHours() < 8 || (now.getHours() === 8 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '0500'
-  } else if (now.getHours() <= 11 || now.getMinutes() <= 10) {
-    base_date = todayDate
-    base_time = '0800'
-  } else if (now.getHours() < 14 || (now.getHours() === 14 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '1100'
-  } else if (now.getHours() < 17 || (now.getHours() === 17 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '1400'
-  } else if (now.getHours() < 20 || (now.getHours() === 20 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '1700'
-  } else if (now.getHours() < 23 || (now.getHours() === 23 && now.getMinutes() <= 10)) {
-    base_date = todayDate
-    base_time = '2000'
-  } else {
-    base_date = todayDate
-    base_time = '2300'
-  }
-
-  return { base_time, base_date }
-}
-
-const windTable = {
-  0: 'N',
-  1: 'NNE',
-  2: 'NE',
-  3: 'ENE',
-  4: 'E',
-  5: 'ESE',
-  6: 'SE',
-  7: 'SSE',
-  8: 'S',
-  9: 'SSW',
-  10: 'SW',
-  11: 'WSW',
-  12: 'W',
-  13: 'WNW',
-  14: 'NW',
-  15: 'NNW',
-  16: 'N'
-}
-const directoinMapping = {
-  N: '북',
-  S: '남',
-  E: '동',
-  W: '서'
-}
-
-function _getWindDirectionByValue(value: number): string {
-  const calc: number | null = Math.floor((Number(value) + 22.5 * 0.5) / 22.5) || null
-
-  if (calc === null) return ''
-
-  return windTable[calc]?.replace(/[NSEW]/g, match => directoinMapping[match]) || ''
-}

package/client/pages/project/component/project-update-header.ts

@@ -1,88 +0,0 @@
-import '@material/web/icon/icon.js'
-import { css, html, LitElement } from 'lit'
-import { customElement, property } from 'lit/decorators.js'
-import { ButtonContainerStyles, ScrollbarStyles } from '@operato/styles'
-
-@customElement('project-update-header')
-class ProjectUpdateHeader extends LitElement {
-  static styles = [
-    ButtonContainerStyles,
-    ScrollbarStyles,
-    css`
-      div[header] {
-        display: flex;
-        margin: 0px var(--spacing-large, 12px);
-
-        h2 {
-          flex: 1;
-          margin-bottom: var(--spacing-medium, 8px);
-          color: #3f71a0;
-          font-size:18px;
-        }
-      }
-
-      div[button-container] {
-        display: flex;
-        align-items: center;
-        justify-content: end;
-        flex: 1;
-        padding-top: var(--spacing-medium, 8px);   
-
-        md-elevated-button {
-          margin: 0 var(--spacing-small, 4px);
-
-          --md-elevated-button-container-height: 32px;
-          --md-elevated-button-label-text-size: 16px;
-          --md-elevated-button-container-color: #0595e5;
-
-          --md-elevated-button-label-text-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-hover-label-text-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-pressed-label-text-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-focus-label-text-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-icon-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-hover-icon-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-pressed-icon-color: var(--md-sys-color-on-primary);
-          --md-elevated-button-focus-icon-color: var(--md-sys-color-on-primary);
-
-          &[green] {
-            --md-elevated-button-container-color: #42b382;
-          }
-        }
-      }
-    `
-  ]
-
-  @property({ type: String }) projectId: string = ''
-  @property({ type: String }) title: string = ''
-
-  render() {
-    const path = window.location.pathname
-
-    return html`
-      <div header>
-        <h2>${this.title}</h2>
-        <div button-container>
-          <md-elevated-button green @click=${this._dispatchEvent} ?disabled=${!this.projectId}>
-            <md-icon slot="icon">save</md-icon>정보 저장
-          </md-elevated-button>
-          <md-elevated-button
-            href=${`project-update/${this.projectId}`}
-            ?disabled=${!this.projectId || path.includes('project-update/')}
-          >
-            <md-icon slot="icon">assignment</md-icon>프로젝트 정보 수정
-          </md-elevated-button>
-          <md-elevated-button
-            href=${`project-plan-management/${this.projectId}`}
-            ?disabled=${!this.projectId || path.includes('project-plan-management/')}
-          >
-            <md-icon slot="icon">description</md-icon>도면 관리
-          </md-elevated-button>
-        </div>
-      </div>
-    `
-  }
-
-  private _dispatchEvent() {
-    this.dispatchEvent(new CustomEvent('custom-click'))
-  }
-}