@dssp/project 1.0.0-alpha.0 → 1.0.0-alpha.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-client/index.d.ts +1 -0
- package/dist-client/index.js +1 -1
- package/dist-client/index.js.map +1 -1
- package/dist-client/pages/lib/chatbot-widget.d.ts +53 -0
- package/dist-client/pages/lib/chatbot-widget.js +631 -0
- package/dist-client/pages/lib/chatbot-widget.js.map +1 -0
- package/dist-client/pages/lib/select2-component.d.ts +1 -1
- package/dist-client/pages/lib/select2-component.js +36 -36
- package/dist-client/pages/lib/select2-component.js.map +1 -1
- package/dist-client/pages/lib/waether.d.ts +2 -1
- package/dist-client/pages/lib/waether.js +7 -3
- package/dist-client/pages/lib/waether.js.map +1 -1
- package/dist-client/pages/project/component/pagenation.d.ts +18 -0
- package/dist-client/pages/project/component/pagenation.js +142 -0
- package/dist-client/pages/project/component/pagenation.js.map +1 -0
- package/dist-client/pages/project/component/project-update-header.js +26 -3
- package/dist-client/pages/project/component/project-update-header.js.map +1 -1
- package/dist-client/pages/project/popup/checklist/task-checklist-attachment-list-popup.d.ts +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-attachment-list-popup.js +308 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-attachment-list-popup.js.map +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-comment-list-popup.d.ts +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-comment-list-popup.js +356 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-comment-list-popup.js.map +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-create-popup.d.ts +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-create-popup.js +682 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-create-popup.js.map +1 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-view.d.ts +33 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-view.js +676 -0
- package/dist-client/pages/project/popup/checklist/task-checklist-view.js.map +1 -0
- package/dist-client/pages/project/popup/popup-plan-export.d.ts +10 -0
- package/dist-client/pages/project/popup/popup-plan-export.js +242 -0
- package/dist-client/pages/project/popup/popup-plan-export.js.map +1 -0
- package/dist-client/pages/project/popup/popup-plan-upload.d.ts +3 -0
- package/dist-client/pages/project/popup/popup-plan-upload.js +130 -4
- package/dist-client/pages/project/popup/popup-plan-upload.js.map +1 -1
- package/dist-client/pages/project/popup/popup-project-create.js.map +1 -1
- package/dist-client/pages/project/popup/{popup-schedule-upload.d.ts → popup-task-upload.d.ts} +1 -1
- package/dist-client/pages/project/popup/{popup-schedule-upload.js → popup-task-upload.js} +9 -9
- package/dist-client/pages/project/popup/popup-task-upload.js.map +1 -0
- package/dist-client/pages/project/project-completed-list.d.ts +5 -0
- package/dist-client/pages/project/project-completed-list.js +32 -4
- package/dist-client/pages/project/project-completed-list.js.map +1 -1
- package/dist-client/pages/project/project-detail.d.ts +8 -1
- package/dist-client/pages/project/project-detail.js +488 -163
- package/dist-client/pages/project/project-detail.js.map +1 -1
- package/dist-client/pages/project/project-list.d.ts +69 -0
- package/dist-client/pages/project/project-list.js +94 -16
- package/dist-client/pages/project/project-list.js.map +1 -1
- package/dist-client/pages/project/project-plan-management.js +35 -14
- package/dist-client/pages/project/project-plan-management.js.map +1 -1
- package/dist-client/pages/project/project-setting-list.d.ts +7 -0
- package/dist-client/pages/project/project-setting-list.js +82 -27
- package/dist-client/pages/project/project-setting-list.js.map +1 -1
- package/dist-client/pages/project/{project-schedule-list.d.ts → project-task-list.d.ts} +2 -2
- package/dist-client/pages/project/{project-schedule-list.js → project-task-list.js} +11 -11
- package/dist-client/pages/project/project-task-list.js.map +1 -0
- package/dist-client/pages/project/{project-schedule.d.ts → project-task.d.ts} +17 -4
- package/dist-client/pages/project/project-task.js +692 -0
- package/dist-client/pages/project/project-task.js.map +1 -0
- package/dist-client/pages/project/project-update.d.ts +35 -0
- package/dist-client/pages/project/project-update.js +633 -49
- package/dist-client/pages/project/project-update.js.map +1 -1
- package/dist-client/pages/resource/construction-detail-type-popup.js.map +1 -1
- package/dist-client/pages/resource/construction-type-management.js +14 -0
- package/dist-client/pages/resource/construction-type-management.js.map +1 -1
- package/dist-client/pages/resource/inspection-drawing-type-management.js.map +1 -1
- package/dist-client/pages/resource/inspection-part-popup.js.map +1 -1
- package/dist-client/pages/resource/resource-importer.js.map +1 -1
- package/dist-client/pages/resource/resource-list-page.d.ts +1 -2
- package/dist-client/pages/resource/resource-list-page.js +1 -2
- package/dist-client/pages/resource/resource-list-page.js.map +1 -1
- package/dist-client/pages/resource/worker-type-management.js.map +1 -1
- package/dist-client/pages/task/task-importer.js.map +1 -1
- package/dist-client/pages/task/task-list-page.d.ts +1 -2
- package/dist-client/pages/task/task-list-page.js +1 -2
- package/dist-client/pages/task/task-list-page.js.map +1 -1
- package/dist-client/pages/task-resource/task-resource-importer.js.map +1 -1
- package/dist-client/pages/task-resource/task-resource-list-page.d.ts +1 -2
- package/dist-client/pages/task-resource/task-resource-list-page.js +1 -2
- package/dist-client/pages/task-resource/task-resource-list-page.js.map +1 -1
- package/dist-client/route.d.ts +1 -1
- package/dist-client/route.js +4 -4
- package/dist-client/route.js.map +1 -1
- package/dist-client/shared/domain-context.d.ts +18 -0
- package/dist-client/shared/domain-context.js +28 -0
- package/dist-client/shared/domain-context.js.map +1 -0
- package/dist-client/tsconfig.tsbuildinfo +1 -1
- package/dist-client/viewparts/domain-switch.d.ts +19 -0
- package/dist-client/viewparts/domain-switch.js +274 -0
- package/dist-client/viewparts/domain-switch.js.map +1 -0
- package/dist-server/controllers/export-tasks.js +1 -2
- package/dist-server/controllers/export-tasks.js.map +1 -1
- package/dist-server/controllers/import-task.js +1 -2
- package/dist-server/controllers/import-task.js.map +1 -1
- package/dist-server/controllers/parse-excel.d.ts +0 -2
- package/dist-server/controllers/parse-excel.js +1 -2
- package/dist-server/controllers/parse-excel.js.map +1 -1
- package/dist-server/middlewares/index.js +1 -2
- package/dist-server/middlewares/index.js.map +1 -1
- package/dist-server/migrations/1723861466413-seed-roles.js.map +1 -1
- package/dist-server/migrations/1723861466414-seed-codes.js +1 -1
- package/dist-server/migrations/1723861466414-seed-codes.js.map +1 -1
- package/dist-server/migrations/1723861476419-seed-resources.js.map +1 -1
- package/dist-server/migrations/1723861478420-seed-/bsample-project.js.map +1 -1
- package/dist-server/migrations/1723861478421-seed-/bsample-tasks.js.map +1 -1
- package/dist-server/service/construction-detail-type/construction-detail-type-mutation.js +2 -2
- package/dist-server/service/construction-detail-type/construction-detail-type-mutation.js.map +1 -1
- package/dist-server/service/construction-detail-type/construction-detail-type-query.js +2 -2
- package/dist-server/service/construction-detail-type/construction-detail-type-query.js.map +1 -1
- package/dist-server/service/construction-detail-type/construction-detail-type-type.js +4 -4
- package/dist-server/service/construction-detail-type/construction-detail-type-type.js.map +1 -1
- package/dist-server/service/construction-detail-type/construction-detail-type.js +2 -2
- package/dist-server/service/construction-detail-type/construction-detail-type.js.map +1 -1
- package/dist-server/service/construction-type/construction-type-mutation.js +2 -2
- package/dist-server/service/construction-type/construction-type-mutation.js.map +1 -1
- package/dist-server/service/construction-type/construction-type-query.d.ts +2 -2
- package/dist-server/service/construction-type/construction-type-query.js +7 -12
- package/dist-server/service/construction-type/construction-type-query.js.map +1 -1
- package/dist-server/service/construction-type/construction-type-type.d.ts +1 -0
- package/dist-server/service/construction-type/construction-type-type.js +8 -4
- package/dist-server/service/construction-type/construction-type-type.js.map +1 -1
- package/dist-server/service/construction-type/construction-type.d.ts +1 -0
- package/dist-server/service/construction-type/construction-type.js +7 -2
- package/dist-server/service/construction-type/construction-type.js.map +1 -1
- package/dist-server/service/index.d.ts +3 -2
- package/dist-server/service/index.js +6 -2
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-mutation.js +2 -2
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-mutation.js.map +1 -1
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-query.d.ts +2 -2
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-query.js +7 -12
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-query.js.map +1 -1
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-type.js +4 -4
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type-type.js.map +1 -1
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type.js +2 -2
- package/dist-server/service/inspection-drawing-type/inspection-drawing-type.js.map +1 -1
- package/dist-server/service/inspection-part/inspection-part-mutation.js +2 -2
- package/dist-server/service/inspection-part/inspection-part-mutation.js.map +1 -1
- package/dist-server/service/inspection-part/inspection-part-query.js +2 -2
- package/dist-server/service/inspection-part/inspection-part-query.js.map +1 -1
- package/dist-server/service/inspection-part/inspection-part-type.js +4 -4
- package/dist-server/service/inspection-part/inspection-part-type.js.map +1 -1
- package/dist-server/service/inspection-part/inspection-part.js +2 -2
- package/dist-server/service/inspection-part/inspection-part.js.map +1 -1
- package/dist-server/service/manager/index.d.ts +2 -0
- package/dist-server/service/manager/index.js +3 -1
- package/dist-server/service/manager/index.js.map +1 -1
- package/dist-server/service/manager/manager-mutation.js +2 -2
- package/dist-server/service/manager/manager-mutation.js.map +1 -1
- package/dist-server/service/manager/manager-query.d.ts +1 -1
- package/dist-server/service/manager/manager-query.js +5 -9
- package/dist-server/service/manager/manager-query.js.map +1 -1
- package/dist-server/service/manager/manager-type.js +4 -4
- package/dist-server/service/manager/manager-type.js.map +1 -1
- package/dist-server/service/manager/manager.js +2 -2
- package/dist-server/service/manager/manager.js.map +1 -1
- package/dist-server/service/project/issue-project-code.d.ts +7 -0
- package/dist-server/service/project/issue-project-code.js +27 -0
- package/dist-server/service/project/issue-project-code.js.map +1 -0
- package/dist-server/service/project/project-mutation.d.ts +3 -0
- package/dist-server/service/project/project-mutation.js +231 -24
- package/dist-server/service/project/project-mutation.js.map +1 -1
- package/dist-server/service/project/project-query.d.ts +14 -2
- package/dist-server/service/project/project-query.js +167 -16
- package/dist-server/service/project/project-query.js.map +1 -1
- package/dist-server/service/project/project-type.d.ts +14 -2
- package/dist-server/service/project/project-type.js +57 -11
- package/dist-server/service/project/project-type.js.map +1 -1
- package/dist-server/service/project/project.d.ts +29 -0
- package/dist-server/service/project/project.js +103 -5
- package/dist-server/service/project/project.js.map +1 -1
- package/dist-server/service/resource/resource-mutation.js +7 -8
- package/dist-server/service/resource/resource-mutation.js.map +1 -1
- package/dist-server/service/resource/resource-query.d.ts +2 -2
- package/dist-server/service/resource/resource-query.js +7 -12
- package/dist-server/service/resource/resource-query.js.map +1 -1
- package/dist-server/service/resource/resource-type.js +6 -6
- package/dist-server/service/resource/resource-type.js.map +1 -1
- package/dist-server/service/resource/resource.js +3 -3
- package/dist-server/service/resource/resource.js.map +1 -1
- package/dist-server/service/task/task-mutation.js +2 -2
- package/dist-server/service/task/task-mutation.js.map +1 -1
- package/dist-server/service/task/task-query.d.ts +2 -0
- package/dist-server/service/task/task-query.js +15 -4
- package/dist-server/service/task/task-query.js.map +1 -1
- package/dist-server/service/task/task-type.js +10 -10
- package/dist-server/service/task/task-type.js.map +1 -1
- package/dist-server/service/task/task.d.ts +2 -0
- package/dist-server/service/task/task.js +13 -8
- package/dist-server/service/task/task.js.map +1 -1
- package/dist-server/service/task-checklist-binding/index.d.ts +5 -0
- package/dist-server/service/task-checklist-binding/index.js +9 -0
- package/dist-server/service/task-checklist-binding/index.js.map +1 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-mutation.d.ts +5 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-mutation.js +188 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-mutation.js.map +1 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-query.d.ts +8 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-query.js +61 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-query.js.map +1 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-type.d.ts +15 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-type.js +57 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding-type.js.map +1 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding.d.ts +22 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding.js +106 -0
- package/dist-server/service/task-checklist-binding/task-checklist-binding.js.map +1 -0
- package/dist-server/service/task-resource/task-resource-mutation.js +2 -2
- package/dist-server/service/task-resource/task-resource-mutation.js.map +1 -1
- package/dist-server/service/task-resource/task-resource-query.d.ts +2 -2
- package/dist-server/service/task-resource/task-resource-query.js +6 -11
- package/dist-server/service/task-resource/task-resource-query.js.map +1 -1
- package/dist-server/service/task-resource/task-resource-type.js +6 -6
- package/dist-server/service/task-resource/task-resource-type.js.map +1 -1
- package/dist-server/service/task-resource/task-resource.js +2 -2
- package/dist-server/service/task-resource/task-resource.js.map +1 -1
- package/dist-server/service/worker-type/worker-type-mutation.js +2 -2
- package/dist-server/service/worker-type/worker-type-mutation.js.map +1 -1
- package/dist-server/service/worker-type/worker-type-query.d.ts +2 -2
- package/dist-server/service/worker-type/worker-type-query.js +7 -12
- package/dist-server/service/worker-type/worker-type-query.js.map +1 -1
- package/dist-server/service/worker-type/worker-type-type.js +4 -4
- package/dist-server/service/worker-type/worker-type-type.js.map +1 -1
- package/dist-server/service/worker-type/worker-type.js +2 -2
- package/dist-server/service/worker-type/worker-type.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +15 -11
- package/things-factory.config.js +3 -3
- package/translations/en.json +10 -9
- package/translations/ja.json +15 -1
- package/translations/ko.json +3 -0
- package/translations/ms.json +15 -1
- package/translations/zh.json +15 -1
- package/client/bootstrap.ts +0 -0
- package/client/index.ts +0 -0
- package/client/pages/lib/select2-component.ts +0 -175
- package/client/pages/lib/waether.ts +0 -159
- package/client/pages/project/component/project-update-header.ts +0 -88
- package/client/pages/project/popup/popup-plan-upload.ts +0 -138
- package/client/pages/project/popup/popup-project-create.ts +0 -147
- package/client/pages/project/popup/popup-schedule-upload.ts +0 -102
- package/client/pages/project/project-completed-list.ts +0 -281
- package/client/pages/project/project-detail.ts +0 -738
- package/client/pages/project/project-list.ts +0 -418
- package/client/pages/project/project-plan-management.ts +0 -476
- package/client/pages/project/project-schedule-list.ts +0 -294
- package/client/pages/project/project-schedule.ts +0 -393
- package/client/pages/project/project-setting-list.ts +0 -393
- package/client/pages/project/project-update.ts +0 -876
- package/client/pages/resource/construction-detail-type-popup.ts +0 -201
- package/client/pages/resource/construction-type-management.ts +0 -212
- package/client/pages/resource/inspection-drawing-type-management.ts +0 -245
- package/client/pages/resource/inspection-part-popup.ts +0 -201
- package/client/pages/resource/resource-importer.ts +0 -97
- package/client/pages/resource/resource-list-page.ts +0 -356
- package/client/pages/resource/worker-type-management.ts +0 -192
- package/client/pages/task/task-importer.ts +0 -94
- package/client/pages/task/task-list-page.ts +0 -340
- package/client/pages/task-resource/task-resource-importer.ts +0 -97
- package/client/pages/task-resource/task-resource-list-page.ts +0 -356
- package/client/route.ts +0 -55
- package/client/tsconfig.json +0 -11
- package/dist-client/pages/project/popup/popup-schedule-upload.js.map +0 -1
- package/dist-client/pages/project/project-schedule-list.js.map +0 -1
- package/dist-client/pages/project/project-schedule.js +0 -407
- package/dist-client/pages/project/project-schedule.js.map +0 -1
- package/server/controllers/export-tasks.ts +0 -40
- package/server/controllers/import-task.ts +0 -134
- package/server/controllers/index.ts +0 -0
- package/server/controllers/parse-excel.ts +0 -86
- package/server/controllers/types.ts +0 -20
- package/server/index.ts +0 -4
- package/server/middlewares/index.ts +0 -3
- package/server/migrations/1723861466413-seed-roles.ts +0 -128
- package/server/migrations/1723861466414-seed-codes.ts +0 -157
- package/server/migrations/1723861476419-seed-resources.ts +0 -62
- package/server/migrations/1723861478420-seed-/bsample-project.ts +0 -87
- package/server/migrations/1723861478421-seed-/bsample-tasks.ts +0 -194
- package/server/migrations/index.ts +0 -9
- package/server/routes.ts +0 -108
- package/server/service/construction-detail-type/construction-detail-type-mutation.ts +0 -57
- package/server/service/construction-detail-type/construction-detail-type-query.ts +0 -31
- package/server/service/construction-detail-type/construction-detail-type-type.ts +0 -26
- package/server/service/construction-detail-type/construction-detail-type.ts +0 -52
- package/server/service/construction-detail-type/index.ts +0 -6
- package/server/service/construction-type/construction-type-mutation.ts +0 -66
- package/server/service/construction-type/construction-type-query.ts +0 -56
- package/server/service/construction-type/construction-type-type.ts +0 -26
- package/server/service/construction-type/construction-type.ts +0 -74
- package/server/service/construction-type/index.ts +0 -6
- package/server/service/index.ts +0 -56
- package/server/service/inspection-drawing-type/index.ts +0 -6
- package/server/service/inspection-drawing-type/inspection-drawing-type-mutation.ts +0 -69
- package/server/service/inspection-drawing-type/inspection-drawing-type-query.ts +0 -55
- package/server/service/inspection-drawing-type/inspection-drawing-type-type.ts +0 -23
- package/server/service/inspection-drawing-type/inspection-drawing-type.ts +0 -68
- package/server/service/inspection-part/index.ts +0 -6
- package/server/service/inspection-part/inspection-part-mutation.ts +0 -52
- package/server/service/inspection-part/inspection-part-query.ts +0 -41
- package/server/service/inspection-part/inspection-part-type.ts +0 -26
- package/server/service/inspection-part/inspection-part.ts +0 -51
- package/server/service/manager/index.ts +0 -6
- package/server/service/manager/manager-mutation.ts +0 -42
- package/server/service/manager/manager-query.ts +0 -28
- package/server/service/manager/manager-type.ts +0 -40
- package/server/service/manager/manager.ts +0 -29
- package/server/service/project/index.ts +0 -6
- package/server/service/project/project-mutation.ts +0 -255
- package/server/service/project/project-query.ts +0 -105
- package/server/service/project/project-type.ts +0 -72
- package/server/service/project/project.ts +0 -134
- package/server/service/resource/index.ts +0 -7
- package/server/service/resource/resource-mutation.ts +0 -137
- package/server/service/resource/resource-query.ts +0 -50
- package/server/service/resource/resource-type.ts +0 -41
- package/server/service/resource/resource.ts +0 -82
- package/server/service/task/index.ts +0 -6
- package/server/service/task/task-mutation.ts +0 -135
- package/server/service/task/task-query.ts +0 -169
- package/server/service/task/task-type.ts +0 -75
- package/server/service/task/task.ts +0 -130
- package/server/service/task-resource/index.ts +0 -7
- package/server/service/task-resource/task-resource-mutation.ts +0 -140
- package/server/service/task-resource/task-resource-query.ts +0 -36
- package/server/service/task-resource/task-resource-type.ts +0 -41
- package/server/service/task-resource/task-resource.ts +0 -51
- package/server/service/worker-type/index.ts +0 -6
- package/server/service/worker-type/worker-type-mutation.ts +0 -66
- package/server/service/worker-type/worker-type-query.ts +0 -47
- package/server/service/worker-type/worker-type-type.ts +0 -26
- package/server/service/worker-type/worker-type.ts +0 -68
- package/server/tsconfig.json +0 -10
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
import ExcelJS from 'exceljs'
|
|
2
|
-
import { RawTask } from './types'
|
|
3
|
-
import { Project } from '../service/project/project'
|
|
4
|
-
import { importTasks } from './import-task'
|
|
5
|
-
|
|
6
|
-
export async function parseExcelAndImportTasks(buffer: Buffer, project: Project, context: ResolverContext) {
|
|
7
|
-
// 1. 엑셀 파일을 읽어들입니다.
|
|
8
|
-
const workbook = new ExcelJS.Workbook()
|
|
9
|
-
await workbook.xlsx.load(buffer)
|
|
10
|
-
|
|
11
|
-
// 2. 첫 번째 워크시트를 가져옵니다.
|
|
12
|
-
const worksheet = workbook.getWorksheet(1) // Index or sheet name can be used
|
|
13
|
-
|
|
14
|
-
// 3. 첫 번째 row를 header로 사용합니다.
|
|
15
|
-
const headers: string[] = []
|
|
16
|
-
let taskCodeColumnIndex = -1
|
|
17
|
-
|
|
18
|
-
const headerRow = worksheet.getRow(1)
|
|
19
|
-
headerRow.eachCell((cell, colNumber) => {
|
|
20
|
-
const headerText = cell.text.toString()
|
|
21
|
-
headers[colNumber - 1] = headerText // Store headers in an array
|
|
22
|
-
|
|
23
|
-
if (headerText === '작업코드') {
|
|
24
|
-
taskCodeColumnIndex = colNumber // Store the column index for "작업코드"
|
|
25
|
-
}
|
|
26
|
-
})
|
|
27
|
-
|
|
28
|
-
if (taskCodeColumnIndex === -1) {
|
|
29
|
-
throw new Error('작업코드 column not found')
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
// 4. 엑셀 데이터를 RawTask 형식으로 변환합니다.
|
|
33
|
-
const tasks: RawTask[] = []
|
|
34
|
-
|
|
35
|
-
// Start processing from the second row onward to skip the header
|
|
36
|
-
for (let rowIndex = 2; rowIndex <= worksheet.rowCount; rowIndex++) {
|
|
37
|
-
const row = worksheet.getRow(rowIndex)
|
|
38
|
-
const taskData: any = {}
|
|
39
|
-
|
|
40
|
-
row.eachCell((cell, colNumber) => {
|
|
41
|
-
const header = headers[colNumber - 1]
|
|
42
|
-
|
|
43
|
-
// Check if the cell has a formula(or sharedFormula) and use the formula result
|
|
44
|
-
let cellValue: any = cell.value
|
|
45
|
-
if (cellValue && typeof cellValue === 'object' && ('formula' in cellValue || 'sharedFormula' in cellValue)) {
|
|
46
|
-
// Cell contains a formula, use the calculated result if available
|
|
47
|
-
cellValue = cellValue.result ?? cellValue.value // Use the result, or fallback to value if result is not calculated
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
taskData[header] = cellValue
|
|
51
|
-
})
|
|
52
|
-
|
|
53
|
-
const taskCodeCell = row.getCell(taskCodeColumnIndex)
|
|
54
|
-
let bgColor = '#FFFFFF'
|
|
55
|
-
const fill = taskCodeCell.style.fill
|
|
56
|
-
|
|
57
|
-
if (fill && fill.type === 'pattern' && fill.pattern === 'solid') {
|
|
58
|
-
const fgColor = fill.fgColor
|
|
59
|
-
if (fgColor && fgColor.argb) {
|
|
60
|
-
// ARGB is a color in the format AARRGGBB, remove the alpha channel (first two characters)
|
|
61
|
-
bgColor = `#${fgColor.argb.slice(2)}`
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
const task: RawTask = {
|
|
66
|
-
code: taskData['작업코드'],
|
|
67
|
-
title: taskData['작업명'],
|
|
68
|
-
type: taskData['세부공종'],
|
|
69
|
-
duration: taskData['기간'],
|
|
70
|
-
startDate: taskData['시작일'],
|
|
71
|
-
dependsOn: taskData['선행작업코드'],
|
|
72
|
-
progress: taskData['진척율'],
|
|
73
|
-
tags: taskData['Tags'] ? taskData['Tags'].split(',') : [],
|
|
74
|
-
resources: taskData['Resources'] ? JSON.parse(taskData['Resources']) : [],
|
|
75
|
-
style: bgColor,
|
|
76
|
-
children: []
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
if (task.code && task.type) {
|
|
80
|
-
tasks.push(task)
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
// 5. 변환된 데이터를 importTasks 함수로 전달합니다.
|
|
85
|
-
await importTasks(project, tasks, context)
|
|
86
|
-
}
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { Task, TaskType } from '../service/task/task'
|
|
2
|
-
|
|
3
|
-
export interface RawResource {
|
|
4
|
-
type: string
|
|
5
|
-
allocated: number
|
|
6
|
-
}
|
|
7
|
-
|
|
8
|
-
export interface RawTask {
|
|
9
|
-
code: string
|
|
10
|
-
title: string
|
|
11
|
-
type?: TaskType
|
|
12
|
-
duration?: number
|
|
13
|
-
startDate?: Date | string
|
|
14
|
-
dependsOn?: string
|
|
15
|
-
progress?: number
|
|
16
|
-
tags?: string[]
|
|
17
|
-
style?: string
|
|
18
|
-
resources?: RawResource[]
|
|
19
|
-
children?: RawTask[]
|
|
20
|
-
}
|
package/server/index.ts
DELETED
|
@@ -1,128 +0,0 @@
|
|
|
1
|
-
import { MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { logger } from '@things-factory/env'
|
|
4
|
-
import { Domain, getRepository } from '@things-factory/shell'
|
|
5
|
-
import { Privilege, Role, User } from '@things-factory/auth-base'
|
|
6
|
-
|
|
7
|
-
const SEED_ROLES = [
|
|
8
|
-
{
|
|
9
|
-
name: '감리사',
|
|
10
|
-
description: '감리사',
|
|
11
|
-
privileges: [
|
|
12
|
-
{
|
|
13
|
-
name: 'query',
|
|
14
|
-
category: 'board'
|
|
15
|
-
},
|
|
16
|
-
{
|
|
17
|
-
name: 'query',
|
|
18
|
-
category: 'attachment'
|
|
19
|
-
}
|
|
20
|
-
]
|
|
21
|
-
},
|
|
22
|
-
{
|
|
23
|
-
name: '설계사',
|
|
24
|
-
description: '설계사',
|
|
25
|
-
privileges: [
|
|
26
|
-
{
|
|
27
|
-
name: 'query',
|
|
28
|
-
category: 'board'
|
|
29
|
-
},
|
|
30
|
-
{
|
|
31
|
-
name: 'query',
|
|
32
|
-
category: 'attachment'
|
|
33
|
-
}
|
|
34
|
-
]
|
|
35
|
-
},
|
|
36
|
-
{
|
|
37
|
-
name: '현장관리자',
|
|
38
|
-
description: '현장관리자',
|
|
39
|
-
privileges: [
|
|
40
|
-
{
|
|
41
|
-
name: 'query',
|
|
42
|
-
category: 'board'
|
|
43
|
-
},
|
|
44
|
-
{
|
|
45
|
-
name: 'query',
|
|
46
|
-
category: 'attachment'
|
|
47
|
-
}
|
|
48
|
-
]
|
|
49
|
-
},
|
|
50
|
-
{
|
|
51
|
-
name: '시공자',
|
|
52
|
-
description: '시공자',
|
|
53
|
-
privileges: [
|
|
54
|
-
{
|
|
55
|
-
name: 'query',
|
|
56
|
-
category: 'board'
|
|
57
|
-
},
|
|
58
|
-
{
|
|
59
|
-
name: 'query',
|
|
60
|
-
category: 'attachment'
|
|
61
|
-
}
|
|
62
|
-
]
|
|
63
|
-
}
|
|
64
|
-
]
|
|
65
|
-
|
|
66
|
-
export class Roles1723861466413 implements MigrationInterface {
|
|
67
|
-
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
68
|
-
const domainRepository = getRepository(Domain)
|
|
69
|
-
const roleRepository = getRepository(Role)
|
|
70
|
-
const userRepository = getRepository(User)
|
|
71
|
-
const privilegeRepository = getRepository(Privilege)
|
|
72
|
-
|
|
73
|
-
const domain: Domain = await domainRepository.findOne({
|
|
74
|
-
where: { name: 'SYSTEM' }
|
|
75
|
-
})
|
|
76
|
-
|
|
77
|
-
const admin: User = await userRepository.findOne({
|
|
78
|
-
where: { email: 'admin@hatiolab.com' }
|
|
79
|
-
})
|
|
80
|
-
|
|
81
|
-
try {
|
|
82
|
-
for (let i = 0; i < SEED_ROLES.length; i++) {
|
|
83
|
-
const { name, description, privileges } = SEED_ROLES[i]
|
|
84
|
-
|
|
85
|
-
const role = await roleRepository.save({
|
|
86
|
-
domain,
|
|
87
|
-
name,
|
|
88
|
-
description,
|
|
89
|
-
creator: admin,
|
|
90
|
-
updater: admin
|
|
91
|
-
})
|
|
92
|
-
|
|
93
|
-
const ps = []
|
|
94
|
-
|
|
95
|
-
for (const privilege of privileges) {
|
|
96
|
-
const { name, category } = privilege
|
|
97
|
-
ps.push(
|
|
98
|
-
await privilegeRepository.findOne({
|
|
99
|
-
where: {
|
|
100
|
-
name,
|
|
101
|
-
category
|
|
102
|
-
}
|
|
103
|
-
})
|
|
104
|
-
)
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
role.privileges = ps
|
|
108
|
-
|
|
109
|
-
await roleRepository.save(role)
|
|
110
|
-
}
|
|
111
|
-
} catch (e) {
|
|
112
|
-
logger.error(e)
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
117
|
-
const domainRepository = getRepository(Domain)
|
|
118
|
-
const roleRepository = getRepository(Role)
|
|
119
|
-
|
|
120
|
-
const domain: Domain = await domainRepository.findOne({
|
|
121
|
-
where: { name: 'SYSTEM' }
|
|
122
|
-
})
|
|
123
|
-
|
|
124
|
-
SEED_ROLES.reverse().forEach(async ({ name }) => {
|
|
125
|
-
await roleRepository.delete({ name, domain: { id: domain.id } })
|
|
126
|
-
})
|
|
127
|
-
}
|
|
128
|
-
}
|
|
@@ -1,157 +0,0 @@
|
|
|
1
|
-
import { MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { logger } from '@things-factory/env'
|
|
4
|
-
import { Domain, getRepository } from '@things-factory/shell'
|
|
5
|
-
import { User } from '@things-factory/auth-base'
|
|
6
|
-
import { CommonCode, CommonCodeDetail } from '@things-factory/code-base'
|
|
7
|
-
|
|
8
|
-
const SEED_COMMON_CODES = [
|
|
9
|
-
{
|
|
10
|
-
name: 'EMPLOYEE_TYPE',
|
|
11
|
-
description: '직원 유형',
|
|
12
|
-
details: [
|
|
13
|
-
{
|
|
14
|
-
name: 'FULLTIME',
|
|
15
|
-
description: '풀타임 정규직',
|
|
16
|
-
labels: null,
|
|
17
|
-
rank: 1
|
|
18
|
-
},
|
|
19
|
-
{
|
|
20
|
-
name: 'PARTTIME',
|
|
21
|
-
description: '파트타임 정규직',
|
|
22
|
-
labels: null,
|
|
23
|
-
rank: 2
|
|
24
|
-
},
|
|
25
|
-
{
|
|
26
|
-
name: 'TEMPORARY',
|
|
27
|
-
description: '임시직',
|
|
28
|
-
labels: null,
|
|
29
|
-
rank: 3
|
|
30
|
-
}
|
|
31
|
-
]
|
|
32
|
-
},
|
|
33
|
-
{
|
|
34
|
-
name: 'JOB_POSITION',
|
|
35
|
-
description: '직급',
|
|
36
|
-
details: [
|
|
37
|
-
{
|
|
38
|
-
name: '임원',
|
|
39
|
-
description: '임원',
|
|
40
|
-
labels: null,
|
|
41
|
-
rank: 1
|
|
42
|
-
},
|
|
43
|
-
{
|
|
44
|
-
name: '직원',
|
|
45
|
-
description: '직원',
|
|
46
|
-
labels: null,
|
|
47
|
-
rank: 2
|
|
48
|
-
}
|
|
49
|
-
]
|
|
50
|
-
},
|
|
51
|
-
{
|
|
52
|
-
name: 'JOB_RESPONSIBILITY',
|
|
53
|
-
description: '직책',
|
|
54
|
-
details: [
|
|
55
|
-
{
|
|
56
|
-
name: 'ADMIN',
|
|
57
|
-
description: '관리자',
|
|
58
|
-
labels: null,
|
|
59
|
-
rank: 1
|
|
60
|
-
},
|
|
61
|
-
{
|
|
62
|
-
name: 'OVERALL_SUPERVISORY',
|
|
63
|
-
description: '총괄 감리 책임자',
|
|
64
|
-
labels: null,
|
|
65
|
-
rank: 2
|
|
66
|
-
},
|
|
67
|
-
{
|
|
68
|
-
name: 'TASK_SUPERVISORY',
|
|
69
|
-
description: '공종별 감리 책임자',
|
|
70
|
-
labels: null,
|
|
71
|
-
rank: 3
|
|
72
|
-
},
|
|
73
|
-
{
|
|
74
|
-
name: 'OVERALL_CONSTRUCTOR',
|
|
75
|
-
description: '총괄 시공 책임자',
|
|
76
|
-
labels: null,
|
|
77
|
-
rank: 4
|
|
78
|
-
},
|
|
79
|
-
{
|
|
80
|
-
name: 'TASK_CONSTRUCTOR',
|
|
81
|
-
description: '공종별 시공 관리자',
|
|
82
|
-
labels: null,
|
|
83
|
-
rank: 5
|
|
84
|
-
},
|
|
85
|
-
{
|
|
86
|
-
name: 'DESIGNER',
|
|
87
|
-
description: '설계사',
|
|
88
|
-
labels: null,
|
|
89
|
-
rank: 6
|
|
90
|
-
},
|
|
91
|
-
{
|
|
92
|
-
name: 'CONSTRUCTOR',
|
|
93
|
-
description: '시공자',
|
|
94
|
-
labels: null,
|
|
95
|
-
rank: 7
|
|
96
|
-
}
|
|
97
|
-
]
|
|
98
|
-
}
|
|
99
|
-
]
|
|
100
|
-
|
|
101
|
-
export class SeedCodes1723861466414 implements MigrationInterface {
|
|
102
|
-
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
103
|
-
const commonCodeRepository = getRepository(CommonCode)
|
|
104
|
-
const commonCodeDetailRepository = getRepository(CommonCodeDetail)
|
|
105
|
-
const domainRepository = getRepository(Domain)
|
|
106
|
-
const userRepository = getRepository(User)
|
|
107
|
-
|
|
108
|
-
const domain: Domain = await domainRepository.findOne({
|
|
109
|
-
where: { name: 'SYSTEM' }
|
|
110
|
-
})
|
|
111
|
-
const user = await userRepository.findOne({ where: { id: domain.owner } })
|
|
112
|
-
|
|
113
|
-
try {
|
|
114
|
-
for (let i = 0; i < SEED_COMMON_CODES.length; i++) {
|
|
115
|
-
const { name, description, details } = SEED_COMMON_CODES[i]
|
|
116
|
-
|
|
117
|
-
const commonCode = await commonCodeRepository.save({
|
|
118
|
-
domain,
|
|
119
|
-
name,
|
|
120
|
-
description,
|
|
121
|
-
creator: user,
|
|
122
|
-
updater: user
|
|
123
|
-
})
|
|
124
|
-
|
|
125
|
-
for (const commonCodeDetail of details) {
|
|
126
|
-
const { name, description, labels, rank } = commonCodeDetail
|
|
127
|
-
|
|
128
|
-
await commonCodeDetailRepository.save({
|
|
129
|
-
domain,
|
|
130
|
-
commonCode,
|
|
131
|
-
name,
|
|
132
|
-
description,
|
|
133
|
-
labels,
|
|
134
|
-
rank
|
|
135
|
-
})
|
|
136
|
-
}
|
|
137
|
-
}
|
|
138
|
-
} catch (e) {
|
|
139
|
-
logger.error(e)
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
|
|
143
|
-
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
144
|
-
const domainRepository = getRepository(Domain)
|
|
145
|
-
|
|
146
|
-
const domain: Domain = await domainRepository.findOne({
|
|
147
|
-
where: { name: 'SYSTEM' }
|
|
148
|
-
})
|
|
149
|
-
|
|
150
|
-
const repository = getRepository(CommonCode)
|
|
151
|
-
|
|
152
|
-
SEED_COMMON_CODES.reverse().forEach(async commonCode => {
|
|
153
|
-
let record = await repository.findOne({ where: { name: commonCode.name, domain: { id: domain.id } } })
|
|
154
|
-
record && (await repository.remove(record))
|
|
155
|
-
})
|
|
156
|
-
}
|
|
157
|
-
}
|
|
@@ -1,62 +0,0 @@
|
|
|
1
|
-
import { MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { logger } from '@things-factory/env'
|
|
4
|
-
import { Domain, getRepository } from '@things-factory/shell'
|
|
5
|
-
import { User } from '@things-factory/auth-base'
|
|
6
|
-
import { ResourceType, Resource } from '../service/resource/resource'
|
|
7
|
-
|
|
8
|
-
const SEED_RESOURCES = [
|
|
9
|
-
{ name: '철근/형틀공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
10
|
-
{ name: '방수공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
11
|
-
{ name: '목공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
12
|
-
{ name: '금속공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
13
|
-
{ name: '타일공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
14
|
-
{ name: '창호공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
15
|
-
{ name: '도배공', type: ResourceType.HUMAN, unit: 'man/day' },
|
|
16
|
-
{ name: '조적공', type: ResourceType.HUMAN, unit: 'man/day' }
|
|
17
|
-
]
|
|
18
|
-
|
|
19
|
-
export class SeedResources1723861476419 implements MigrationInterface {
|
|
20
|
-
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
21
|
-
const resourceRepository = getRepository(Resource)
|
|
22
|
-
const domainRepository = getRepository(Domain)
|
|
23
|
-
const userRepository = getRepository(User)
|
|
24
|
-
|
|
25
|
-
const domain: Domain = await domainRepository.findOne({
|
|
26
|
-
where: { name: 'SYSTEM' }
|
|
27
|
-
})
|
|
28
|
-
const user = await userRepository.findOne({ where: { id: domain.owner } })
|
|
29
|
-
|
|
30
|
-
try {
|
|
31
|
-
for (let i = 0; i < SEED_RESOURCES.length; i++) {
|
|
32
|
-
const { name, type, unit } = SEED_RESOURCES[i]
|
|
33
|
-
|
|
34
|
-
const resource = await resourceRepository.save({
|
|
35
|
-
domain,
|
|
36
|
-
name,
|
|
37
|
-
type,
|
|
38
|
-
unit,
|
|
39
|
-
creator: user,
|
|
40
|
-
updater: user
|
|
41
|
-
})
|
|
42
|
-
}
|
|
43
|
-
} catch (e) {
|
|
44
|
-
logger.error(e)
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
49
|
-
const domainRepository = getRepository(Domain)
|
|
50
|
-
|
|
51
|
-
const domain: Domain = await domainRepository.findOne({
|
|
52
|
-
where: { name: 'SYSTEM' }
|
|
53
|
-
})
|
|
54
|
-
|
|
55
|
-
const repository = getRepository(Resource)
|
|
56
|
-
|
|
57
|
-
SEED_RESOURCES.reverse().forEach(async resource => {
|
|
58
|
-
let record = await repository.findOne({ where: { name: resource.name, domain: { id: domain.id } } })
|
|
59
|
-
record && (await repository.remove(record))
|
|
60
|
-
})
|
|
61
|
-
}
|
|
62
|
-
}
|
|
@@ -1,87 +0,0 @@
|
|
|
1
|
-
import { MigrationInterface, QueryRunner } from 'typeorm'
|
|
2
|
-
|
|
3
|
-
import { logger } from '@things-factory/env'
|
|
4
|
-
import { Domain, getRepository } from '@things-factory/shell'
|
|
5
|
-
import { User } from '@things-factory/auth-base'
|
|
6
|
-
import { BuildingComplex } from '@dssp/building-complex'
|
|
7
|
-
import { Project, ProjectState } from '../service/project/project'
|
|
8
|
-
|
|
9
|
-
const SEED_SAMPLE_BUILDING_COMPLEX = {
|
|
10
|
-
address: '서울시 마포구 공덕동 아파트 17번지',
|
|
11
|
-
longitude: 37.548239525193,
|
|
12
|
-
latitude: 126.95315808838,
|
|
13
|
-
clientCompany: 'A 고객',
|
|
14
|
-
constructionCompany: 'B 건설',
|
|
15
|
-
supervisoryComapny: 'C 감리',
|
|
16
|
-
designCompany: 'D 디자인',
|
|
17
|
-
constructionType: '아파트',
|
|
18
|
-
etc: '',
|
|
19
|
-
householdCount: 500,
|
|
20
|
-
buildingCount: 5,
|
|
21
|
-
notice: '',
|
|
22
|
-
planXScale: 20,
|
|
23
|
-
planYScale: 20,
|
|
24
|
-
area: 22700
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
const SEED_SAMPLE_PROJECT = {
|
|
28
|
-
name: '서울시 마포구 공덕동 아파트 신축공사',
|
|
29
|
-
state: ProjectState.ONGOING,
|
|
30
|
-
startDate: '2024-01-01',
|
|
31
|
-
endDate: '2025-12-31',
|
|
32
|
-
totalProgress: 40,
|
|
33
|
-
weeklyProgress: 37
|
|
34
|
-
}
|
|
35
|
-
|
|
36
|
-
export class SeedSampleProject1723861478420 implements MigrationInterface {
|
|
37
|
-
public async up(queryRunner: QueryRunner): Promise<void> {
|
|
38
|
-
const buildingRepository = getRepository(BuildingComplex)
|
|
39
|
-
const projectRepository = getRepository(Project)
|
|
40
|
-
const domainRepository = getRepository(Domain)
|
|
41
|
-
const userRepository = getRepository(User)
|
|
42
|
-
|
|
43
|
-
const domain: Domain = await domainRepository.findOne({
|
|
44
|
-
where: { name: 'SYSTEM' }
|
|
45
|
-
})
|
|
46
|
-
const user = await userRepository.findOne({ where: { id: domain.owner } })
|
|
47
|
-
|
|
48
|
-
try {
|
|
49
|
-
const buildingComplex = await buildingRepository.save({
|
|
50
|
-
domain,
|
|
51
|
-
...SEED_SAMPLE_BUILDING_COMPLEX,
|
|
52
|
-
creator: user,
|
|
53
|
-
updater: user
|
|
54
|
-
})
|
|
55
|
-
|
|
56
|
-
const project = await projectRepository.save({
|
|
57
|
-
domain,
|
|
58
|
-
...SEED_SAMPLE_PROJECT,
|
|
59
|
-
buildingComplex,
|
|
60
|
-
creator: user,
|
|
61
|
-
updater: user
|
|
62
|
-
})
|
|
63
|
-
} catch (e) {
|
|
64
|
-
logger.error(e)
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
public async down(queryRunner: QueryRunner): Promise<void> {
|
|
69
|
-
const domainRepository = getRepository(Domain)
|
|
70
|
-
|
|
71
|
-
const domain: Domain = await domainRepository.findOne({
|
|
72
|
-
where: { name: 'SYSTEM' }
|
|
73
|
-
})
|
|
74
|
-
|
|
75
|
-
const repository = getRepository(Project)
|
|
76
|
-
|
|
77
|
-
let project = await repository.findOne({ where: { name: SEED_SAMPLE_PROJECT.name, domain: { id: domain.id } } })
|
|
78
|
-
project && (await repository.remove(project))
|
|
79
|
-
|
|
80
|
-
const buildRepository = getRepository(BuildingComplex)
|
|
81
|
-
|
|
82
|
-
let buildingComplex = await buildRepository.findOne({
|
|
83
|
-
where: { address: SEED_SAMPLE_BUILDING_COMPLEX.address, domain: { id: domain.id } }
|
|
84
|
-
})
|
|
85
|
-
buildingComplex && (await buildRepository.remove(buildingComplex))
|
|
86
|
-
}
|
|
87
|
-
}
|