@dssp/project 0.0.7 → 0.0.9

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

@@ -124,7 +124,12 @@ export class ProjectDetail extends ScopedElementsMixin(PageView) {
 
               img {
                 width: 42%;
-                height: fit-content;
+                height: auto;
+                aspect-ratio: 1920 / 1080;
+              }
+              img[no-image] {
+                object-fit: contain;
+                opacity: 0.5;
               }
 
               div[row] {
@@ -138,10 +143,13 @@ export class ProjectDetail extends ScopedElementsMixin(PageView) {
           }
 
           div[left-bottom] {
-            img {
+            [building-complex-img] {
               width: 100%;
               aspect-ratio: 2 / 1;
             }
+            img {
+              opacity: 0.5;
+            }
 
             div[subject] {
               margin-bottom: 7px;
@@ -360,7 +368,10 @@ export class ProjectDetail extends ScopedElementsMixin(PageView) {
           <div left-top>
             <h3>기본 정보</h3>
             <div content-1>
-              <img project-img src=${this.project.mainPhoto?.fullpath || ''} />
+              <img
+                ?no-image=${!this.project.mainPhoto?.fullpath}
+                src=${this.project.mainPhoto?.fullpath || '/assets/images/no-image.png'}
+              />
 
               <div>
                 <div row>
@@ -412,7 +423,9 @@ export class ProjectDetail extends ScopedElementsMixin(PageView) {
 
           <div left-bottom>
             <h3>조감도(BIM도면)</h3>
-            <img src=${this.project.buildingComplex?.drawing?.fullpath || ''} />
+            ${this.project.buildingComplex?.drawing?.fullpath
+              ? html`<div building-complex-img></div>`
+              : html`<img building-complex-img src="/assets/images/img-building-complex-default.jpg" />`}
             <div>
               <div subject bold>개별 단지 상세정보 바로가기</div>
               <div building-container>

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

@@ -162,6 +162,10 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
             width: 285px;
             background-color: #cccccc80;
           }
+          img[project-img][no-image] {
+            object-fit: contain;
+            opacity: 0.5;
+          }
 
           span[project-info] {
             flex: 0.45;
@@ -252,7 +256,11 @@ export class ProjectListPage extends ScopedElementsMixin(PageView) {
           return html`
             <div project-container>
               <a href=${`project-detail/${project.id}`}>
-                <img project-img src=${project.mainPhoto?.fullpath || ''} />
+                <img
+                  ?no-image=${!project.mainPhoto?.fullpath}
+                  project-img
+                  src=${project.mainPhoto?.fullpath || '/assets/images/no-image.png'}
+                />
 
                 <span project-info>
                   <div name>${project.name}</div>

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

@@ -79,6 +79,10 @@ export class ProjectScheduleListPage extends ScopedElementsMixin(PageView) {
             width: 285px;
             background-color: #cccccc80;
           }
+          img[project-img][no-image] {
+            object-fit: contain;
+            opacity: 0.5;
+          }
 
           span[project-info] {
             flex: 0.45;
@@ -169,7 +173,11 @@ export class ProjectScheduleListPage extends ScopedElementsMixin(PageView) {
           return html`
             <div project-container>
               <a href=${`project-schedule/${project.id}`}>
-                <img project-img src=${project.mainPhoto?.fullpath || ''} />
+                <img
+                  ?no-image=${!project.mainPhoto?.fullpath}
+                  project-img
+                  src=${project.mainPhoto?.fullpath || '/assets/images/no-image.png'}
+                />
 
                 <span project-info>
                   <div name>${project.name}</div>
@@ -181,14 +189,12 @@ export class ProjectScheduleListPage extends ScopedElementsMixin(PageView) {
 
                 <span project-state>
                   <div progress>
-                    <md-linear-progress buffer="100" max="100" value=${project.totalProgress || 0}>
-                    </md-linear-progress>
+                    <md-linear-progress buffer="100" max="100" value=${project.totalProgress || 0}> </md-linear-progress>
                     <span>전체</span>
                     <span>${project.totalProgress || 0}%</span>
                   </div>
                   <div progress>
-                    <md-linear-progress buffer="100" max="100" value=${project.weeklyProgress || 0}>
-                    </md-linear-progress>
+                    <md-linear-progress buffer="100" max="100" value=${project.weeklyProgress || 0}> </md-linear-progress>
                     <span>주간</span>
                     <span>${project.weeklyProgress || 0}%</span>
                   </div>
@@ -203,14 +209,12 @@ export class ProjectScheduleListPage extends ScopedElementsMixin(PageView) {
                     <span>${project.inspPassRate || 0}%</span>
                   </div>
                   <div progress>
-                    <md-linear-progress buffer="100" max="100" value=${project.robotProgressRate || 0}>
-                    </md-linear-progress>
+                    <md-linear-progress buffer="100" max="100" value=${project.robotProgressRate || 0}> </md-linear-progress>
                     <span>Robot Progress</span>
                     <span>${project.robotProgressRate || 0}%</span>
                   </div>
                   <div progress>
-                    <md-linear-progress buffer="100" max="100" value=${project.structuralSafetyRate || 0}>
-                    </md-linear-progress>
+                    <md-linear-progress buffer="100" max="100" value=${project.structuralSafetyRate || 0}> </md-linear-progress>
                     <span>Structural safety</span>
                     <span>${project.structuralSafetyRate || 0}%</span>
                   </div>

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

@@ -21,8 +21,9 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
   static styles = [
     css`
       :host {
-        display: grid;
-        grid-template-rows: 75px auto;
+        display: flex;
+        flex-direction: column;
+
         color: #4e5055;
 
         width: 100%;
@@ -72,10 +73,13 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       }
 
       div[body] {
+        flex: 1;
+
         display: flex;
         flex-direction: column;
         margin: 0px 25px 25px 25px;
         gap: 15px;
+        overflow: hidden;
 
         h3 {
           color: #2e79be;
@@ -88,29 +92,13 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
           border-radius: 5px;
         }
 
-        div[chart-container] {
+        ox-gantt {
           flex: 1;
-          flex-direction: column;
-          border: 1px solid #cccccc80;
-
-          div[chart] {
-            flex: 0.7;
-            background: #03a9f44d;
+          box-sizing: border-box;
+          overflow: hidden;
 
-            ox-gantt {
-              max-width: 91vw;
-              aspect-ratio: 3 / 1;
-              box-sizing: border-box;
-
-              background-color: var(--md-sys-color-primary-container);
-              color: var(--md-sys-color-on-primary-container);
-            }
-          }
-
-          div[table] {
-            flex: 0.3;
-            background: #8fd170b8;
-          }
+          background-color: var(--md-sys-color-primary-container);
+          color: var(--md-sys-color-on-primary-container);
         }
 
         div[select-container] {
@@ -182,6 +170,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '',
       length: '5d',
       tags: ['active'],
+      resources: [{ type: '철근/형틀공', allocated: 6 }],
       children: []
     },
     {
@@ -195,6 +184,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '1',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '철근/형틀공', allocated: 6 }],
       children: []
     },
     {
@@ -220,7 +210,35 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
           dependsOn: '',
           length: '4d',
           tags: ['done'],
-          children: []
+          children: [
+            {
+              id: '3-1-1',
+              title: 'Coding-A',
+              type: 'task',
+              // section: developmentSection,
+              startDate: '2023-01-07',
+              endDate: '2023-01-10',
+              progress: 60,
+              dependsOn: '',
+              length: '4d',
+              tags: ['active'],
+              resources: [{ type: '창호공', allocated: 5 }],
+              children: []
+            },
+            {
+              id: '3-1-2',
+              title: 'Coding-B',
+              type: 'task',
+              // section: developmentSection,
+              startDate: '2023-01-11',
+              endDate: '2023-01-15',
+              dependsOn: '3-1-1',
+              length: '5d',
+              tags: ['active'],
+              resources: [{ type: '창호공', allocated: 3 }],
+              children: []
+            }
+          ]
         },
         {
           id: '3-2',
@@ -232,6 +250,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
           dependsOn: '3-1',
           length: '5d',
           tags: ['active'],
+          resources: [{ type: '창호공', allocated: 6 }],
           children: []
         }
       ]
@@ -247,6 +266,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '1',
       length: '1d',
       tags: ['done'],
+      resources: [{ type: '방수공', allocated: 5 }],
       children: []
     },
     {
@@ -259,6 +279,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '4',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '목공', allocated: 3 }],
       children: []
     },
     {
@@ -271,6 +292,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '5',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '금속공', allocated: 1 }],
       children: []
     },
     {
@@ -283,6 +305,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '6',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '타일공', allocated: 6 }],
       children: []
     },
     {
@@ -295,6 +318,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '7',
       length: '1d',
       tags: ['critical'],
+      resources: [{ type: '창호공', allocated: 7 }],
       children: []
     },
     {
@@ -307,6 +331,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '8',
       length: '1d',
       tags: ['active'],
+      resources: [{ type: '도배공', allocated: 8 }],
       children: []
     },
     {
@@ -319,6 +344,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '9',
       length: '1d',
       tags: ['critical'],
+      resources: [{ type: '조적공', allocated: 6 }],
       children: []
     },
     {
@@ -331,6 +357,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '9',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '철근/형틀공', allocated: 6 }],
       children: []
     },
     {
@@ -342,8 +369,37 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       endDate: '2023-01-23',
       dependsOn: '9',
       length: '1d',
+      resources: [{ type: '방수공', allocated: 6 }],
       tags: ['milestone'],
-      children: []
+      children: [
+        {
+          id: '12-1',
+          title: 'Coding-A',
+          type: 'task',
+          // section: developmentSection,
+          startDate: '2023-01-07',
+          endDate: '2023-01-10',
+          progress: 60,
+          dependsOn: '',
+          length: '4d',
+          tags: ['done'],
+          resources: [{ type: '방수공', allocated: 6 }],
+          children: []
+        },
+        {
+          id: '12-2',
+          title: 'Coding-B',
+          type: 'task',
+          // section: developmentSection,
+          startDate: '2023-01-11',
+          endDate: '2023-01-15',
+          dependsOn: '12-1',
+          length: '5d',
+          tags: ['active'],
+          resources: [{ type: '조적공', allocated: 6 }],
+          children: []
+        }
+      ]
     },
     {
       id: '13',
@@ -367,6 +423,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '13',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '금속공', allocated: 1 }],
       children: []
     },
     {
@@ -390,6 +447,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       endDate: '2023-02-05',
       dependsOn: '15',
       length: '1d',
+      resources: [{ type: '창호공', allocated: 1 }],
       tags: ['active'],
       children: []
     },
@@ -427,6 +485,7 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       dependsOn: '18',
       length: '1d',
       tags: ['milestone'],
+      resources: [{ type: '창호공', allocated: 7 }],
       children: []
     }
   ]
@@ -449,27 +508,20 @@ export class ProjectSchedule extends ScopedElementsMixin(PageView) {
       </div>
 
       <div body>
-        <div chart-container>
-          <div chart>
-            <ox-gantt
-              from-date=${new Date(this.fromDate).toISOString().split('T')[0]}
-              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)
-              }}
-              @task-clicked=${(e: CustomEvent) => {
-                console.log('task-clicked', e.detail)
-              }}
-              ?extend-grid-lines=${this.extendGridLines}
-            >
-            </ox-gantt>
-          </div>
-          <div table>
-            <table></table>
-          </div>
-        </div>
+        <ox-gantt
+          from-date=${new Date(this.fromDate).toISOString().split('T')[0]}
+          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)
+          }}
+          @task-clicked=${(e: CustomEvent) => {
+            console.log('task-clicked', e.detail)
+          }}
+          ?extend-grid-lines=${this.extendGridLines}
+        >
+        </ox-gantt>
         <div select-container>
           <div date>
             <span name>기간선택</span>

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

@@ -89,6 +89,10 @@ export class ProjectSettingList extends ScopedElementsMixin(PageView) {
             aspect-ratio: 2;
             background-color: #cccccc80;
           }
+          img[project-img][no-image] {
+            object-fit: contain;
+            opacity: 0.5;
+          }
 
           span[project-info] {
             flex: 0.45;
@@ -208,7 +212,11 @@ export class ProjectSettingList extends ScopedElementsMixin(PageView) {
 
           return html`
             <div project-container>
-              <img project-img src=${project.mainPhoto?.fullpath || ''} />
+              <img
+                ?no-image=${!project.mainPhoto?.fullpath}
+                project-img
+                src=${project.mainPhoto?.fullpath || '/assets/images/no-image.png'}
+              />
 
               <span project-info>
                 <div name>${project.name}</div>

package/dist-client/pages/project/project-detail.js

@@ -47,7 +47,7 @@ let ProjectDetail = class ProjectDetail extends ScopedElementsMixin(PageView) {
         };
     }
     render() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         return html `
       <div header>
         <h2>${this.project.name}</h2>
@@ -69,12 +69,15 @@ let ProjectDetail = class ProjectDetail extends ScopedElementsMixin(PageView) {
           <div left-top>
             <h3>기본 정보</h3>
             <div content-1>
-              <img project-img src=${((_a = this.project.mainPhoto) === null || _a === void 0 ? void 0 : _a.fullpath) || ''} />
+              <img
+                ?no-image=${!((_a = this.project.mainPhoto) === null || _a === void 0 ? void 0 : _a.fullpath)}
+                src=${((_b = this.project.mainPhoto) === null || _b === void 0 ? void 0 : _b.fullpath) || '/assets/images/no-image.png'}
+              />
 
               <div>
                 <div row>
                   <span>- 면적 : </span>
-                  <span>${(_b = this.project.buildingComplex) === null || _b === void 0 ? void 0 : _b.area}</span>
+                  <span>${(_c = this.project.buildingComplex) === null || _c === void 0 ? void 0 : _c.area}</span>
                 </div>
                 <div row>
                   <span>- 착공 ~ 준공 : </span>
@@ -82,19 +85,19 @@ let ProjectDetail = class ProjectDetail extends ScopedElementsMixin(PageView) {
                 </div>
                 <div row>
                   <span>- 발주처 : </span>
-                  <span>${(_c = this.project.buildingComplex) === null || _c === void 0 ? void 0 : _c.clientCompany}</span>
+                  <span>${(_d = this.project.buildingComplex) === null || _d === void 0 ? void 0 : _d.clientCompany}</span>
                 </div>
                 <div row>
                   <span>- 건설사 : </span>
-                  <span>${(_d = this.project.buildingComplex) === null || _d === void 0 ? void 0 : _d.constructionCompany}</span>
+                  <span>${(_e = this.project.buildingComplex) === null || _e === void 0 ? void 0 : _e.constructionCompany}</span>
                 </div>
                 <div row>
                   <span>- 감리사 : </span>
-                  <span>${(_e = this.project.buildingComplex) === null || _e === void 0 ? void 0 : _e.supervisoryCompany}</span>
+                  <span>${(_f = this.project.buildingComplex) === null || _f === void 0 ? void 0 : _f.supervisoryCompany}</span>
                 </div>
                 <div row>
                   <span>- 설계사 : </span>
-                  <span>${(_f = this.project.buildingComplex) === null || _f === void 0 ? void 0 : _f.designCompany}</span>
+                  <span>${(_g = this.project.buildingComplex) === null || _g === void 0 ? void 0 : _g.designCompany}</span>
                 </div>
               </div>
             </div>
@@ -102,30 +105,32 @@ let ProjectDetail = class ProjectDetail extends ScopedElementsMixin(PageView) {
             <div content-2>
               <div row>
                 <span>- 건설구분 : </span>
-                <span>${(_g = this.project.buildingComplex) === null || _g === void 0 ? void 0 : _g.constructionType}</span>
+                <span>${(_h = this.project.buildingComplex) === null || _h === void 0 ? void 0 : _h.constructionType}</span>
               </div>
               <div row>
                 <span>- 공사금액 : </span>
-                <span>${(_h = this.project.buildingComplex) === null || _h === void 0 ? void 0 : _h.constructionCost}</span>
+                <span>${(_j = this.project.buildingComplex) === null || _j === void 0 ? void 0 : _j.constructionCost}</span>
               </div>
               <div row>
                 <span>- 세대수 : </span>
-                <span>${(_j = this.project.buildingComplex) === null || _j === void 0 ? void 0 : _j.householdCount}</span>
+                <span>${(_k = this.project.buildingComplex) === null || _k === void 0 ? void 0 : _k.householdCount}</span>
               </div>
               <div row>
                 <span>- 기타 : </span>
-                <span>${(_k = this.project.buildingComplex) === null || _k === void 0 ? void 0 : _k.etc}</span>
+                <span>${(_l = this.project.buildingComplex) === null || _l === void 0 ? void 0 : _l.etc}</span>
               </div>
             </div>
           </div>
 
           <div left-bottom>
             <h3>조감도(BIM도면)</h3>
-            <img src=${((_m = (_l = this.project.buildingComplex) === null || _l === void 0 ? void 0 : _l.drawing) === null || _m === void 0 ? void 0 : _m.fullpath) || ''} />
+            ${((_o = (_m = this.project.buildingComplex) === null || _m === void 0 ? void 0 : _m.drawing) === null || _o === void 0 ? void 0 : _o.fullpath)
+            ? html `<div building-complex-img></div>`
+            : html `<img building-complex-img src="/assets/images/img-building-complex-default.jpg" />`}
             <div>
               <div subject bold>개별 단지 상세정보 바로가기</div>
               <div building-container>
-                ${(_p = (_o = this.project.buildingComplex) === null || _o === void 0 ? void 0 : _o.buildings) === null || _p === void 0 ? void 0 : _p.map(building => {
+                ${(_q = (_p = this.project.buildingComplex) === null || _p === void 0 ? void 0 : _p.buildings) === null || _q === void 0 ? void 0 : _q.map(building => {
             return html `<md-outlined-button href=${`building-complex-detail/${this.project.id}?buildingId=${building.id}`}>
                     ${building.name}
                   </md-outlined-button>`;
@@ -414,7 +419,12 @@ ProjectDetail.styles = [
 
               img {
                 width: 42%;
-                height: fit-content;
+                height: auto;
+                aspect-ratio: 1920 / 1080;
+              }
+              img[no-image] {
+                object-fit: contain;
+                opacity: 0.5;
               }
 
               div[row] {
@@ -428,10 +438,13 @@ ProjectDetail.styles = [
           }
 
           div[left-bottom] {
-            img {
+            [building-complex-img] {
               width: 100%;
               aspect-ratio: 2 / 1;
             }
+            img {
+              opacity: 0.5;
+            }
 
             div[subject] {
               margin-bottom: 7px;