diff --git a/app/modules/project/templates/project/goal_meeting.html b/app/modules/project/templates/project/goal_meeting.html index 6679d2d..dbc981d 100644 --- a/app/modules/project/templates/project/goal_meeting.html +++ b/app/modules/project/templates/project/goal_meeting.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -16,7 +16,7 @@ + 구역(목표 표 업무 영역)별 줄 — 이번주 할 일·정량 목표 | 전주 할 일·목표·결과·달성률·평가. 전주 칸은 지난 회의록의 같은 줄(carry_from). 쇼핑몰 연결 줄의 결과·전주/금주 매출·누적은 실적 모듈에서 자동. 입력은 관리자만(칸별 즉시 저장, project.js initGoalMeeting). DB: project_db 015 (goal_meetings·goal_meeting_items). #} -
| + {# 이번주 ↔ 지난주 리뷰 순서 바꾸기 — 보는 사람마다 브라우저에 기억(localStorage pj_meet_order:{이메일}) #} + | 이번주 ({{ week[5:] | replace('-', '/') }} ~ {{ week_end[5:] | replace('-', '/') }}) | {# 지난주 = 정확히 7일 전 주 — 줄의 지난주 칸·결과·달성률도 이 주 회의록의 같은 줄(연결키)만 #}지난주 리뷰 ({{ prev_week[5:] | replace('-', '/') }} ~ {{ prev_week_end[5:] | replace('-', '/') }}){% if not h.prev_exists %} — 이 주 회의록 없음{% endif %} | @@ -293,5 +296,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/goals.html b/app/modules/project/templates/project/goals.html index 837dd37..fa4a232 100644 --- a/app/modules/project/templates/project/goals.html +++ b/app/modules/project/templates/project/goals.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -196,5 +196,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/help.html b/app/modules/project/templates/project/help.html index d7ce497..a182691 100644 --- a/app/modules/project/templates/project/help.html +++ b/app/modules/project/templates/project/help.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 81d732b..bf21fa8 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -104,5 +104,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/modules/project/templates/project/mytasks.html b/app/modules/project/templates/project/mytasks.html index 170363f..3bef367 100644 --- a/app/modules/project/templates/project/mytasks.html +++ b/app/modules/project/templates/project/mytasks.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -100,5 +100,5 @@ "today": {{ today | tojson }} } - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index 92a048c..9712322 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + @@ -496,5 +496,5 @@ - + {% endblock %} diff --git a/app/modules/project/templates/project/trash.html b/app/modules/project/templates/project/trash.html index f4bed55..114b962 100644 --- a/app/modules/project/templates/project/trash.html +++ b/app/modules/project/templates/project/trash.html @@ -1,7 +1,7 @@ {% extends "erp_base.html" %} {% block head_extra %} - + {% endblock %} @@ -70,5 +70,5 @@ {% include "project/_side_modals.html" %} {% include "project/_member_tasks_modal.html" %} - + {% endblock %} diff --git a/app/static/project.css b/app/static/project.css index 80dabb8..c061f6d 100644 --- a/app/static/project.css +++ b/app/static/project.css @@ -372,7 +372,30 @@ .pj-card.is-done .pj-card-title { text-decoration: line-through; color: #9aa1a9; } .pj-card-title { font-size: 13.5px; font-weight: 600; color: var(--pj-ink); line-height: 1.4; } .pj-card-meta { display: flex; align-items: center; gap: 6px; margin-top: 10px; } -.pj-card-due { margin-left: auto; font-size: 11px; color: var(--pj-ink-soft); font-weight: 600; } +.pj-card-due { margin-left: auto; font-size: 12.1px; color: var(--pj-ink-soft); font-weight: 600; } /* 11px +10% */ +/* 보드 카드 담당자 — 글자·아바타 10% 크게(12→13.2px, 18→20px) */ +.pj-card-meta .pj-card-assignee { font-size: 13.2px; } +.pj-card-meta .pj-card-assignee .pj-avatar.pj-gicon-sm { width: 20px; height: 20px; } +.pj-card-meta .pj-card-assignee .pj-gicon-sm { font-size: 22px; } +/* 카드 높이 100px 고정(표지 이미지·펼친 하위 작업은 그 위·아래에 더해짐) — 머리 = 100 − 아래 여백 12 − 테두리 2. + 제목은 2줄까지(프로젝트 배지가 있으면 1줄), 담당자·날짜 줄은 맨 아래 */ +.pj-card-head { + box-sizing: border-box; height: 86px; display: flex; flex-direction: column; overflow: hidden; +} +.pj-card-head .pj-card-title { + display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2; overflow: hidden; flex: none; +} +.pj-card-head:has(.pj-card-proj) .pj-card-title { -webkit-line-clamp: 1; } +.pj-card:has(.pj-card-subs-wrap.is-open) .pj-card-head { height: 96px; } /* 펼침 때 아래 10px 여백(음수 margin)만큼 */ +.pj-card-head .pj-card-meta { margin-top: auto; padding-top: 6px; flex: none; } +/* 표지 이미지(설명의 첫 이미지, 아사나식) — 카드 위쪽 끝까지, 위 모서리만 둥글게 */ +.pj-card-cover { + margin: -12px -14px 12px; height: 140px; overflow: hidden; background: #f4f5f7; + border-radius: calc(var(--pj-card-radius) - 1px) calc(var(--pj-card-radius) - 1px) 0 0; +} +.pj-card-cover img { display: block; width: 100%; height: 100%; object-fit: cover; pointer-events: none; } +.pj-card.has-cover .pj-card-head { border-radius: 0; } +.pj-card-meta .pj-card-assignee.is-empty svg, .pj-card-meta .pj-card-due.is-empty svg { width: 24px; height: 24px; } .pj-pri { padding: 1px 7px; border-radius: 999px; font-size: 10px; font-weight: 700; } .pj-pri-high { background: #fbe3df; color: #c22b10; } .pj-pri-low { background: #e6eef0; color: #4a6066; } @@ -1520,7 +1543,7 @@ img.pj-person-ic { width: 22px; height: 22px; } /* 카드 담당자·마감일 없음 — 글자 대신 하위 업무 줄과 같은 점선 원 아이콘(아사나) */ .pj-card-assignee.is-empty, .pj-card-due.is-empty { - display: inline-flex; align-items: center; justify-content: center; width: 24px; height: 24px; + display: inline-flex; align-items: center; justify-content: center; width: 26px; height: 26px; padding: 0; margin: -2px 0; border-radius: 50%; color: #6d6e6f; } .pj-card:hover .pj-card-meta .pj-card-assignee.is-empty, @@ -2441,6 +2464,16 @@ html.pj-goal-selecting, html.pj-goal-selecting * { user-select: none !important; .pj-meet-table thead tr.pj-meet-group th { top: 0; height: 26px; font-size: 12px; } .pj-meet-table thead tr:nth-child(2) th { top: 26px; } .pj-meet-table thead th.is-this { background: #fff7ed; color: #9a4b0b; } +/* 이번주 ↔ 지난주 순서 바꾸기 버튼(표 왼쪽 위 빈 칸) */ +.pj-meet-order-cell { vertical-align: middle; } +.pj-meet-order-btn { + display: inline-flex; align-items: center; gap: 3px; height: 22px; padding: 0 8px 0 5px; border: 1px solid var(--pj-border); + border-radius: 999px; background: #fff; color: var(--pj-ink-soft); font: inherit; font-size: 11.5px; font-weight: 600; cursor: pointer; +} +.pj-meet-order-btn .material-symbols-outlined { font-size: 16px; transition: transform .3s ease; } +.pj-meet-order-btn:hover { color: var(--pj-ink); border-color: #c9ced6; background: #f6f7f9; } +.pj-meet-order-btn[aria-pressed="true"] .material-symbols-outlined { transform: rotate(180deg); } +@media print { .pj-meet-order-btn { display: none; } } .pj-meet-table thead th.is-prev { background: #f1f3f6; color: #4b5563; } .pj-meet-w-sec { width: 80px; } .pj-meet-w-label { width: 160px; } diff --git a/app/static/project.js b/app/static/project.js index 0f6d29c..fef7ddf 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -888,6 +888,25 @@ '||||||||
|---|---|---|---|---|---|---|---|---|---|---|