Auto-deploy from GitHub Actions - 2025-12-18 08:56:34

app/routes.py

@@ -6487,6 +6487,21 @@ def save_webtoon_milestone_workflow_settings():
 def admin_webtoon_milestones():
     # 공개 설정된 웹소설 목록 조회 (원본 파일만)
     files = UploadedFile.query.filter_by(is_public=True, parent_file_id=None).order_by(UploadedFile.uploaded_at.desc()).all()
+    
+    # 각 파일에 대해 일반/휴일 마일스톤 구분
+    for f in files:
+        f.normal_milestones = []
+        f.holiday_milestones = []
+        for ms in f.milestones:
+            try:
+                data = json.loads(ms.schedule_json) if ms.schedule_json else {}
+                if data.get('apply_holidays'):
+                    f.holiday_milestones.append(ms)
+                else:
+                    f.normal_milestones.append(ms)
+            except:
+                f.normal_milestones.append(ms)
+    
     return render_template('admin_webtoon_milestones.html', files=files)
 
 @main_bp.route('/api/webtoons/milestones', methods=['POST'])
@@ -7049,6 +7064,10 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
             except Exception:
                 return None
 
+        # 휴일 스타일 (빨간색 텍스트, 연한 빨간 배경)
+        holiday_font = Font(color="C62828", italic=True)
+        holiday_fill = PatternFill("solid", fgColor="FFEBEE")
+
         row = 2
         for ep in (schedule_data.get("episodes") or []):
             ep_num = ep.get("episode_num")
@@ -7068,6 +7087,45 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
             ws2.cell(row=row, column=6, value=int(ep_dur) if ep_dur is not None else None)
             row += 1
 
+            # 회차 기간 내 휴일 찾기 및 연속 블록으로 묶기
+            if ep_start and ep_end:
+                ep_holidays = get_holidays_in_range(ep_start, ep_end)
+                if ep_holidays:
+                    # 연속된 휴일을 블록으로 묶기
+                    holiday_blocks = []
+                    current_block = None
+                    for h_date in sorted(ep_holidays):
+                        if current_block is None:
+                            current_block = {'start': h_date, 'end': h_date}
+                        else:
+                            diff = (h_date - current_block['end']).days
+                            if diff <= 1:  # 연속된 날짜
+                                current_block['end'] = h_date
+                            else:
+                                holiday_blocks.append(current_block)
+                                current_block = {'start': h_date, 'end': h_date}
+                    if current_block:
+                        holiday_blocks.append(current_block)
+                    
+                    # 휴일 블록 행 추가
+                    for block in holiday_blocks:
+                        h_start = block['start']
+                        h_end = block['end']
+                        h_dur = (h_end - h_start).days + 1
+                        
+                        for col in range(1, 7):
+                            cell = ws2.cell(row=row, column=col)
+                            cell.font = holiday_font
+                            cell.fill = holiday_fill
+                        
+                        ws2.cell(row=row, column=1, value=ep_name)
+                        ws2.cell(row=row, column=2, value="휴일 (주말/공휴일)")
+                        ws2.cell(row=row, column=3, value="HOLIDAY")
+                        ws2.cell(row=row, column=4, value=h_start)
+                        ws2.cell(row=row, column=5, value=h_end)
+                        ws2.cell(row=row, column=6, value=h_dur)
+                        row += 1
+
             for st in (ep.get("stages") or []):
                 st_key = st.get("stage_key")
                 # '작업명'은 단계키를 표시명으로 변환한 값으로 저장
@@ -7110,7 +7168,37 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
                     "start": ep_start,
                     "end": ep_end,
                     "is_group": True,
+                    "is_holiday": False,
                 })
+                
+                # 회차 기간 내 휴일 블록 추가
+                ep_holidays = get_holidays_in_range(ep_start, ep_end)
+                if ep_holidays:
+                    holiday_blocks = []
+                    current_block = None
+                    for h_date in sorted(ep_holidays):
+                        if current_block is None:
+                            current_block = {'start': h_date, 'end': h_date}
+                        else:
+                            diff = (h_date - current_block['end']).days
+                            if diff <= 1:
+                                current_block['end'] = h_date
+                            else:
+                                holiday_blocks.append(current_block)
+                                current_block = {'start': h_date, 'end': h_date}
+                    if current_block:
+                        holiday_blocks.append(current_block)
+                    
+                    for block in holiday_blocks:
+                        gantt_rows.append({
+                            "episode": ep_name,
+                            "stage": "휴일 (주말/공휴일)",
+                            "start": block['start'],
+                            "end": block['end'],
+                            "is_group": False,
+                            "is_holiday": True,
+                        })
+                        
             for st in (ep.get("stages") or []):
                 st_key = st.get("stage_key")
                 st_name = stage_label_map.get(st_key) or st_key
@@ -7123,6 +7211,7 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
                         "start": st_start,
                         "end": st_end,
                         "is_group": False,
+                        "is_holiday": False,
                     })
 
         if gantt_rows:
@@ -7141,6 +7230,7 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
             gantt_header_fill = PatternFill("solid", fgColor="EEF2FF")
             gantt_group_fill = PatternFill("solid", fgColor="D2E3FC")
             gantt_stage_fill = PatternFill("solid", fgColor="BFC5CC")
+            gantt_holiday_fill = PatternFill("solid", fgColor="FFCDD2")  # 연한 빨강
 
             def _fmt_md(d):
                 return f"{d.month}/{d.day}"
@@ -7189,8 +7279,16 @@ def admin_webtoon_milestone_export_xlsx(milestone_id):
                 ws.cell(row=r_idx, column=2, value=gr["stage"])
                 if gr["is_group"]:
                     ws.cell(row=r_idx, column=1).font = Font(bold=True)
+                elif gr.get("is_holiday"):
+                    ws.cell(row=r_idx, column=2).font = Font(color="C62828", italic=True)
                 
-                fill = gantt_group_fill if gr["is_group"] else gantt_stage_fill
+                # 휴일/그룹/일반 스타일 분기
+                if gr.get("is_holiday"):
+                    fill = gantt_holiday_fill
+                elif gr["is_group"]:
+                    fill = gantt_group_fill
+                else:
+                    fill = gantt_stage_fill
 
                 if timeline:
                     for i, td in enumerate(timeline):

templates/admin_webtoon_milestone_detail.html

@@ -186,10 +186,15 @@
         <!-- 메인 컨텐츠 -->
         <div class="main-content">
             <div class="content-scroll">
-                <div style="margin-bottom:24px;">
-                    <h1 style="font-size:22px; font-weight:700; margin-bottom:8px;">{{ milestone.file.original_filename }}</h1>
-                    <div style="font-size:13px; color:var(--muted);">
-                        마일스톤 상세 ({{ milestone.created_at.strftime('%Y-%m-%d') }})
+                <div style="margin-bottom:24px; display:flex; justify-content:space-between; align-items:flex-end;">
+                    <div>
+                        <h1 style="font-size:22px; font-weight:700; margin-bottom:8px;">{{ milestone.file.original_filename }}</h1>
+                        <div style="font-size:13px; color:var(--muted);">
+                            마일스톤 상세 ({{ milestone.created_at.strftime('%Y-%m-%d') }})
+                        </div>
+                    </div>
+                    <div>
+                        <a class="btn" href="/admin/webtoons/milestones/result/{{ milestone.id }}/export-xlsx">엑셀 저장</a>
                     </div>
                 </div>
 
@@ -204,8 +209,8 @@
                     <div class="card-header">
                         <div class="card-title">제작 공정표 (Gantt)</div>
                         <div class="view-controls" style="display:flex; gap:8px; align-items:center;">
-                            <a class="btn" href="/admin/webtoons/milestones/result/{{ milestone.id }}/export-xlsx">엑셀 저장</a>
-                            <button class="btn active" data-mode="Week" onclick="changeViewMode('Week')">Week</button>
+                            <button class="btn active" data-mode="Day" onclick="changeViewMode('Day')">Day</button>
+                            <button class="btn" data-mode="Week" onclick="changeViewMode('Week')">Week</button>
                             <button class="btn" data-mode="Month" onclick="changeViewMode('Month')">Month</button>
                         </div>
                     </div>
@@ -233,7 +238,7 @@
             : {};
         let gantt = null;
         let stageKeyMap = {};
-        let currentViewMode = 'Week';
+        let currentViewMode = 'Day';
         let translationInterval = null;
         
         // CSS와 일치해야 함
@@ -291,7 +296,7 @@
 
             gantt = new Gantt("#gantt", tasks, {
                 header_height: HEADER_HEIGHT,
-                column_width: 38,
+                column_width: currentViewMode === 'Day' ? 32 : 38,
                 step: 24,
                 view_modes: ['Quarter Day', 'Half Day', 'Day', 'Week', 'Month'],
                 bar_height: BAR_HEIGHT,

templates/admin_webtoon_milestones.html

@@ -65,11 +65,15 @@
                             <button class="btn" style="background:#e8f0fe; color:#1a73e8; margin-left:4px;" onclick="openCreateModal({{ file.id }}, '{{ file.original_filename }}', true)">생성(휴일)</button>
                         </td>
                         <td style="text-align: center;">
-                            {% if file.milestones %}
-                                {% set latest_ms = file.milestones|sort(attribute='created_at', reverse=True)|first %}
-                                <a href="{{ url_for('main.admin_webtoon_milestone_result', milestone_id=latest_ms.id) }}" class="btn" style="background:#e6f4ea; color:#1e8e3e; padding:6px 10px; font-size:12px; display:inline-block;">확인</a>
-                                <a href="{{ url_for('main.admin_webtoon_milestone_result_holidays', milestone_id=latest_ms.id) }}" class="btn" style="background:#fce8e6; color:#d93025; padding:6px 10px; font-size:12px; margin-left:4px; display:inline-block;">확인(휴일)</a>
-                            {% else %}
+                            {% if file.normal_milestones %}
+                                {% set latest_normal = file.normal_milestones|sort(attribute='created_at', reverse=True)|first %}
+                                <a href="{{ url_for('main.admin_webtoon_milestone_result', milestone_id=latest_normal.id) }}" class="btn" style="background:#e6f4ea; color:#1e8e3e; padding:6px 10px; font-size:12px; display:inline-block;">확인</a>
+                            {% endif %}
+                            {% if file.holiday_milestones %}
+                                {% set latest_holiday = file.holiday_milestones|sort(attribute='created_at', reverse=True)|first %}
+                                <a href="{{ url_for('main.admin_webtoon_milestone_result_holidays', milestone_id=latest_holiday.id) }}" class="btn" style="background:#fce8e6; color:#d93025; padding:6px 10px; font-size:12px; {% if file.normal_milestones %}margin-left:4px; {% endif %}display:inline-block;">확인(휴일)</a>
+                            {% endif %}
+                            {% if not file.normal_milestones and not file.holiday_milestones %}
                                 <span style="color:#bdc1c6; font-size:12px;">-</span>
                             {% endif %}
                         </td>