@dssp/project 0.0.27 → 0.0.29

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

@@ -8,6 +8,10 @@ export class Select2Component extends LitElement {
       position: relative;
       width: 300px;
       border: 1px solid #000;
+      border-radius: 6px;
+      padding: 4px 16px;
+      font-size: 14px;
+      color: var(--md-sys-color-primary);
     }
 
     div[dropdown] {
@@ -18,6 +22,8 @@ export class Select2Component extends LitElement {
 
     div[options] {
       position: absolute;
+      left: 0;
+      top: 30px;
       width: 100%;
       border: 1px solid #ccc;
       background-color: white;
@@ -30,6 +36,10 @@ export class Select2Component extends LitElement {
     div[option] {
       padding: 10px;
       cursor: pointer;
+      border-bottom: 1px solid #ccc;
+    }
+    div[option]:last-child {
+      border-bottom: none;
     }
 
     div[option]:hover {
@@ -48,10 +58,11 @@ export class Select2Component extends LitElement {
     }
 
     div[tag] {
-      background-color: #007bff;
+      background-color: #2e79be;
       color: white;
       padding: 5px 10px;
       border-radius: 20px;
+      font-size: 13px;
       display: inline-flex;
       align-items: center;
       cursor: pointer;

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

@@ -0,0 +1,85 @@
+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 20px;
+
+        h2 {
+          flex: 0.5;
+          color: #3f71a0;
+        }
+      }
+
+      div[button-container] {
+        display: flex;
+        align-items: center;
+        justify-content: end;
+        flex: 0.5;
+
+        md-elevated-button {
+          margin: 0px 3px;
+
+          --md-elevated-button-container-height: 35px;
+          --md-elevated-button-label-text-size: 16px;
+          --md-elevated-button-container-color: #0595e5;
+
+          --md-elevated-button-label-text-color: #fff;
+          --md-elevated-button-hover-label-text-color: #fff;
+          --md-elevated-button-pressed-label-text-color: #fff;
+          --md-elevated-button-focus-label-text-color: #fff;
+          --md-elevated-button-icon-color: #fff;
+          --md-elevated-button-hover-icon-color: #fff;
+          --md-elevated-button-pressed-icon-color: #fff;
+          --md-elevated-button-focus-icon-color: #fff;
+
+          &[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'))
+  }
+}

package/client/pages/project/popup/popup-schedule-upload.ts

@@ -0,0 +1,102 @@
+import { css, html, LitElement } from 'lit'
+import { customElement, property } from 'lit/decorators.js'
+import { client } from '@operato/graphql'
+import { notify } from '@operato/layout'
+import gql from 'graphql-tag'
+import { Attachment } from '@things-factory/attachment-base'
+
+@customElement('popup-schedule-upload')
+export class PopupScheduleUpload extends LitElement {
+  static styles = [
+    css`
+      :host {
+        display: flex;
+        flex-direction: column;
+        background-color: #fff;
+        width: 100%;
+      }
+
+      div[body] {
+        flex: 1;
+
+        div[input-container] {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          gap: 25px;
+          background-color: #f7f7f7;
+          padding: 35px 27px 27px 27px;
+
+          ox-input-file {
+            height: 100px;
+            width: 120px;
+            line-height: 100%;
+          }
+        }
+
+        div[button-container] {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          margin-top: 20px;
+        }
+      }
+    `
+  ]
+
+  @property({ type: Object }) private scheduleTable: Attachment | undefined
+  @property({ type: String }) private projectId: string | undefined
+
+  render() {
+    const icon = this.scheduleTable ? '' : 'upload'
+    const description = this.scheduleTable?.name ? ' ' : '공정표 업로드'
+
+    return html`
+      <div body>
+        <div input-container>
+          <ox-input-file
+            icon=${icon}
+            label=${this.scheduleTable?.name || ''}
+            description=${description}
+            @change=${this._onChangeAttachment.bind(this)}
+          ></ox-input-file>
+        </div>
+
+        <div button-container>
+          <md-outlined-button @click=${this._close}><md-icon slot="icon">cancel</md-icon>취소</md-outlined-button>
+        </div>
+      </div>
+    `
+  }
+
+  private _close() {
+    history.back()
+  }
+
+  // 공정표 업로드
+  async _onChangeAttachment(e: CustomEvent) {
+    const file = e.detail[0] || null
+
+    const response = await client.mutate({
+      mutation: gql`
+        mutation UploadProjectScheduleTable($param: UploadProjectScheduleTable!) {
+          uploadProjectScheduleTable(param: $param)
+        }
+      `,
+      variables: {
+        param: {
+          projectId: this.projectId,
+          scheduleTable: file
+        }
+      },
+      context: {
+        hasUpload: true
+      }
+    })
+
+    if (!response.errors) {
+      notify({ message: '공정표가 업로드 되었습니다.' })
+      this.dispatchEvent(new CustomEvent('uploaded'))
+    }
+  }
+}

package/client/pages/project/project-list.ts

@@ -43,6 +43,7 @@ export interface Project {
   inspPassRate?: number
   robotProgressRate?: number
   structuralSafetyRate?: number
+  scheduleTable?: Attachment
   buildingComplex: BuildingComplex
 }
 export interface BuildingComplex {
@@ -138,7 +139,7 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
 
         width: 100%;
         height: 100%;
-        background-color: #f7f7f7;
+        background-color: var(--md-sys-color-background, #f6f6f6);
 
         --grid-record-emphasized-background-color: red;
         --grid-record-emphasized-color: yellow;
@@ -146,24 +147,24 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
 
       div[header] {
         display: flex;
-        height: 100px;
         align-items: center;
         background-color: #2ea4df1a;
         border: 1px solid #2ea4df33;
-        margin: 15px 23px;
-        font-size: 18px;
-        padding: 7px;
-        border-radius: 5px;
+        margin: var(--spacing-large, 12px);
+        margin-bottom:var(--spacing-small, 5px);
+        padding: var(--spacing-medium, 8px) var(--spacing-large, 12px);
+        border-radius: var(--md-sys-shape-corner-small, 5px);
 
         md-filled-text-field[type='search'] {
-          margin-left: 5px;
-          margin-right: 26px;
-
           --md-filled-text-field-container-shape: 0px;
-          --md-sys-color-primary: #006a6a;
+          --md-sys-color-primary: #2e79be;
           --md-sys-color-surface-container-highest: transparent;
           --md-filled-text-field-label-text-color: #999999;
-          --md-filled-text-field-input-text-color: #4e5055;
+        }
+        strong{
+          flex:1;
+          padding-right:var(--spacing-medium, 8px);
+          text-align:right
         }
 
         md-elevated-button[add-project] {
@@ -181,13 +182,15 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
       div[body] {
         div[project-container] {
           height: 140px;
-          margin: 17px 23px;
-          background-color: #ffffff;
+          margin: var(--spacing-large, 12px);
+          background-color: var(--md-sys-color-on-primary);
           border: 1px solid #cccccc80;
-          border-radius: 5px;
+          border-radius: var(--md-sys-shape-corner-small, 5px);
+          overflow:hidden;
 
           & > a {
             display: flex;
+            gap:0 var(--spacing-large, 12px);
             width: 100%;
             height: 100%;
             text-decoration: none;
@@ -195,7 +198,7 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
           }
 
           img[project-img] {
-            width: 285px;
+            width: 240px;
             background-color: #cccccc80;
           }
           img[project-img][no-image] {
@@ -204,9 +207,9 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
           }
 
           span[project-info] {
-            flex: 0.45;
-            padding: 6px 15px;
-            font-size: 16px;
+            flex: 0.55;
+            padding: var(--spacing-small, 4px);
+            font-size: 14px;
 
             white-space: nowrap;
             overflow: hidden;
@@ -215,17 +218,17 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
             div[name] {
               color: #2e79be;
               font-weight: bold;
-              font-size: 19px;
-              margin-bottom: 2px;
+              font-size: 18px;
+              margin: var(--spacing-small, 4px);
             }
           }
 
           span[project-state] {
-            flex: 0.55;
-            padding: 10px 20px;
+            flex: 0.45;
+            padding: var(--spacing-medium, 8px);
 
             & > div {
-              margin-bottom: 3px;
+              margin: var(--spacing-tiny, 2px);
             }
 
             div[progress] {
@@ -235,21 +238,21 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
                 --md-linear-progress-track-height: 18px;
                 --md-linear-progress-active-indicator-height: 18px;
                 --md-linear-progress-track-shape: 5px;
-                --md-sys-color-primary: #0595e51a;
-                --md-sys-color-surface-container-highest: #0595e533;
+                --md-sys-color-primary: #0595e526;
+                --md-sys-color-surface-container-highest: #0595e52a;
               }
 
               span {
                 position: absolute;
                 top: 0;
-                left: 12px;
+                left: var(--spacing-large, 12px);
                 font-size: 12px;
                 font-weight: bold;
                 color: #2e79be;
 
                 &:last-child {
                   left: unset;
-                  right: 12px;
+                  right: var(--spacing-large, 12px);
                 }
               }
             }
@@ -272,11 +275,10 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
   render() {
     return html`
       <div header>
-        <label>프로젝트 이름</label>
         <md-filled-text-field
           name="projectName"
           type="search"
-          label="프로젝트 이름"
+          label="프로젝트명"
           .value=${this.projectName}
           @input=${this._onInputChange}
           @keypress=${this._onKeypress}

package/client/pages/project/project-plan-management.ts

@@ -16,6 +16,7 @@ import { openPopup } from '@operato/layout'
 import gql from 'graphql-tag'
 import { Building, BuildingLevel, Project } from './project-list'
 import './popup/popup-plan-upload'
+import './component/project-update-header'
 
 @customElement('project-plan-management')
 export class ProjectPlanManagement extends ScopedElementsMixin(PageView) {
@@ -53,44 +54,6 @@ export class ProjectPlanManagement extends ScopedElementsMixin(PageView) {
         font-weight: bold;
       }
 
-      div[header] {
-        display: flex;
-        margin: 0px 20px;
-
-        h2 {
-          flex: 0.5;
-          color: #3f71a0;
-        }
-
-        div[button-container] {
-          display: flex;
-          align-items: center;
-          justify-content: end;
-          flex: 0.5;
-
-          md-elevated-button {
-            margin: 0px 3px;
-
-            --md-elevated-button-container-height: 35px;
-            --md-elevated-button-label-text-size: 16px;
-            --md-elevated-button-container-color: #0595e5;
-
-            --md-elevated-button-label-text-color: #fff;
-            --md-elevated-button-hover-label-text-color: #fff;
-            --md-elevated-button-pressed-label-text-color: #fff;
-            --md-elevated-button-focus-label-text-color: #fff;
-            --md-elevated-button-icon-color: #fff;
-            --md-elevated-button-hover-icon-color: #fff;
-            --md-elevated-button-pressed-icon-color: #fff;
-            --md-elevated-button-focus-icon-color: #fff;
-
-            &[green] {
-              --md-elevated-button-container-color: #42b382;
-            }
-          }
-        }
-      }
-
       div[body] {
         display: grid;
         grid-template-rows: 240px 1fr 60px;
@@ -247,20 +210,8 @@ export class ProjectPlanManagement extends ScopedElementsMixin(PageView) {
 
   render() {
     return html`
-      <div header>
-        <h2>도면 관리</h2>
-        <div button-container>
-          <md-elevated-button green @click=${this._saveProject}>
-            <md-icon slot="icon">save</md-icon>정보 저장
-          </md-elevated-button>
-          <md-elevated-button href=${`project-update/${this.project.id}`}>
-            <md-icon slot="icon">assignment</md-icon>프로젝트 정보 수정
-          </md-elevated-button>
-          <md-elevated-button href=${`project-task-update/${this.project.id}`}>
-            <md-icon slot="icon">event_note</md-icon>공정표 관리
-          </md-elevated-button>
-        </div>
-      </div>
+      <project-update-header .projectId=${this.project.id || ''} title="도면 관리" @custom-click=${this._saveProject}>
+      </project-update-header>
 
       <div body>
         <div building-container>
@@ -415,8 +366,6 @@ export class ProjectPlanManagement extends ScopedElementsMixin(PageView) {
     })
 
     this.project = response.data?.project
-
-    console.log('init project : ', this.project)
   }
 
   private async _saveProject() {

package/client/pages/project/project-schedule.ts

@@ -11,10 +11,13 @@ import { customElement, query, state } from 'lit/decorators.js'
 import { ScopedElementsMixin } from '@open-wc/scoped-elements'
 import { client } from '@operato/graphql'
 import { i18next } from '@operato/i18n'
-
+import { openPopup } from '@operato/layout'
 import gql from 'graphql-tag'
 import { Project } from './project-list'
+import { keyed } from 'lit/directives/keyed.js'
+import { ScrollbarStyles } from '@operato/styles'
 import '@operato/gantt/ox-gantt.js'
+import './popup/popup-schedule-upload'
 
 const TaskFragment = gql`
   fragment TaskFragment on Task {
@@ -36,6 +39,7 @@ const TaskFragment = gql`
 @customElement('project-schedule')
 export class ProjectSchedule extends ScopedElementsMixin(PageView) {
   static styles = [
+    ScrollbarStyles,
     css`
       :host {
         display: flex;
@@ -137,11 +141,25 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
             }
           }
 
-          div[button] {
+          div[construction-list-container] {
             flex: 1;
+            display: flex;
             border-radius: 5px;
             border: 1px solid #cccccc80;
             background-color: #fff;
+            padding: 8px 10px;
+            gap: 10px;
+            overflow-x: auto;
+
+            md-outlined-button {
+              --md-outlined-button-container-height: 30px;
+              --md-outlined-button-trailing-space: 15px;
+              --md-outlined-button-leading-space: 15px;
+              --md-outlined-button-label-text-color: #586878;
+              box-shadow: 1px 1px 1px #0000001a;
+              padding: 8px 16px;
+              font-weight: 700;
+            }
           }
         }
       }
@@ -171,6 +189,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
   @state() project: Project = { ...this.defaultProject }
   @state() selectedBuildingIdx: number = 0
   @state() tasks
+  @state() constructionTypeList = []
 
   @state() private fromDate = '2024-01-01'
   @state() private toDate = '2024-12-31'
@@ -213,13 +232,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       <div header>
         <h2>${this.project.name}</h2>
         <div button-container>
-          <md-elevated-button href=${`project-update/${this.project.id}`}>
-            <md-icon slot="icon">assignment</md-icon>프로젝트 정보 수정
-          </md-elevated-button>
-          <md-elevated-button href=${`project-plan-management/${this.project.id}`}>
-            <md-icon slot="icon">description</md-icon>도면 관리
-          </md-elevated-button>
-          <md-elevated-button href=${`project-task-update/${this.project.id}`}>
+          <md-elevated-button @click=${this._openUploadSchedulePopup}>
             <md-icon slot="icon">event_note</md-icon>공정표 관리
           </md-elevated-button>
         </div>
@@ -231,9 +244,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
           to-date=${new Date(this.toDate).toISOString().split('T')[0]}
           .timeScale=${this.timeScale}
           .tasks=${this.tasks}
-          @date-range-selected=${(e: CustomEvent) => {
-            console.log('date-range-selected', e.detail)
-          }}
+          @date-range-selected=${this.onRangeSelected}
           @task-clicked=${(e: CustomEvent) => {
             console.log('task-clicked', e.detail)
           }}
@@ -253,7 +264,12 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
               <input type="date" name="endDate" project .value=${this.project.endDate || ''} max="9999-12-31" />
             </div>
           </div>
-          <div button></div>
+          <div construction-list-container>
+            ${this.constructionTypeList?.map(
+              (constructionType: any) =>
+                html` <md-outlined-button id=${constructionType.id}>${constructionType.title}</md-outlined-button>`
+            )}
+          </div>
         </div>
       </div>
     `
@@ -286,6 +302,10 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
                 }
               }
             }
+            scheduleTable {
+              id
+              name
+            }
             buildingComplex {
               id
               planXScale
@@ -333,4 +353,31 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
     this.fromDate = this.inputStartDate.value
     this.toDate = this.inputEndDate.value
   }
+
+  onRangeSelected(e: CustomEvent) {
+    const selectedFromDate = new Date(e.detail.start + 'T00:00:00.000Z')
+    const selectedToDate = new Date(e.detail.end + 'T23:59:59.000Z')
+
+    this.constructionTypeList = this.tasks.filter(constuction => {
+      const constuctionStartDate = new Date(constuction.startDate)
+      const constuctionEndDate = new Date(constuction.endDate)
+
+      return constuctionStartDate <= selectedToDate && constuctionEndDate >= selectedFromDate
+    })
+  }
+
+  private _openUploadSchedulePopup() {
+    openPopup(
+      html`<popup-schedule-upload
+        .projectId=${this.projectId}
+        .scheduleTable=${this.project?.scheduleTable}
+        @uploaded=${() => this.initProject(this.projectId)}
+      ></popup-schedule-upload>`,
+      {
+        backdrop: true,
+        size: 'medium',
+        title: `공정표 업로드`
+      }
+    )
+  }
 }