feat(web): стабилизация UI, Gemini-скроллинг, роутеры контекста/снапшотов и актуализация роадмапа
This commit is contained in:
+283
-218
@@ -1,12 +1,18 @@
|
||||
import math
|
||||
"""
|
||||
===============================================================================
|
||||
FILE: services/excel_exporter.py
|
||||
ROLE: Генерация Excel-отчетов (Сводка, Детальный отчет, Сырой СКУД) через XlsxWriter.
|
||||
Корректный расчет часов удаленщиков и исключение лишних списков.
|
||||
===============================================================================
|
||||
"""
|
||||
|
||||
import os
|
||||
import math
|
||||
import time
|
||||
import openpyxl
|
||||
import pandas as pd
|
||||
import xlsxwriter
|
||||
from datetime import datetime, timedelta
|
||||
from openpyxl import Workbook
|
||||
from openpyxl.styles import Font, Alignment, PatternFill, Border, Side
|
||||
from openpyxl.utils import get_column_letter
|
||||
from xlsxwriter.exceptions import FileCreateError
|
||||
from config import REPORTS_DIR
|
||||
|
||||
MONTHS_RU_GENITIVE = {
|
||||
@@ -47,29 +53,25 @@ def get_dated_reports_dir(date_str):
|
||||
return target_dir
|
||||
|
||||
|
||||
THIN_SIDE = Side(border_style="thin", color="D3D3D3")
|
||||
THIN_BORDER = Border(left=THIN_SIDE, right=THIN_SIDE, top=THIN_SIDE, bottom=THIN_SIDE)
|
||||
|
||||
FILL_HEADER = PatternFill(start_color="D9E1F2", end_color="D9E1F2", fill_type="solid")
|
||||
FILL_TOTAL_LIST = PatternFill(start_color="F2F2F2", end_color="F2F2F2", fill_type="solid")
|
||||
FILL_UNEXPLAINED = PatternFill(start_color="FCE4D6", end_color="FCE4D6", fill_type="solid")
|
||||
FILL_PRESENT = PatternFill(start_color="E2EFDA", end_color="E2EFDA", fill_type="solid")
|
||||
FILL_REMOTE = PatternFill(start_color="E8F8F5", end_color="E8F8F5", fill_type="solid")
|
||||
FILL_ANOMALY = PatternFill(start_color="FCE4D6", end_color="FCE4D6", fill_type="solid")
|
||||
FILL_NO_PASS = PatternFill(start_color="E1F5FE", end_color="E1F5FE", fill_type="solid")
|
||||
FILL_EXCEPTIONS = PatternFill(start_color="EFEBE9", end_color="EFEBE9", fill_type="solid")
|
||||
|
||||
CATEGORY_PASTEL_COLORS = ["FFF2CC", "E1D5E7", "E1F5FE", "FFF0F5", "FCF3CF"]
|
||||
YELLOW_FILL = PatternFill(start_color="FFF2CC", end_color="FFF2CC", fill_type="solid")
|
||||
LIGHT_RED_FILL = PatternFill(start_color="FCE4D6", end_color="FCE4D6", fill_type="solid")
|
||||
GREEN_FILL = PatternFill(start_color="E2EFDA", end_color="E2EFDA", fill_type="solid")
|
||||
def safe_close_workbook(wb, output_path, target_dir, filename):
|
||||
try:
|
||||
wb.close()
|
||||
print(f"[✓] Успешно сохранен: {output_path}")
|
||||
return output_path
|
||||
except (FileCreateError, OSError, PermissionError):
|
||||
alt_filename = filename.replace(".xlsx", f"_{int(time.time())}.xlsx")
|
||||
alt_path = os.path.join(target_dir, alt_filename)
|
||||
try:
|
||||
wb.filename = alt_path
|
||||
wb._store_workbook()
|
||||
print(f"[⚠️] Исходный файл открыт в Excel! Сохранено как: {alt_path}")
|
||||
return alt_path
|
||||
except Exception as e:
|
||||
print(f"[❌] Ошибка сохранения даже резервного файла: {e}")
|
||||
return output_path
|
||||
|
||||
|
||||
def calculate_autoclose_time(time_in_str: str) -> tuple[str, str, str]:
|
||||
"""
|
||||
⭐️ Правило 8.5ч: при наличии входа и отсутствии выхода
|
||||
рассчитывает время выхода (Вход + 8ч 30мин) с нормой 8:00 и отклонением 0:00.
|
||||
"""
|
||||
try:
|
||||
parts = time_in_str.strip().split(':')
|
||||
hh = int(parts[0])
|
||||
@@ -84,10 +86,25 @@ def calculate_autoclose_time(time_in_str: str) -> tuple[str, str, str]:
|
||||
|
||||
|
||||
def calculate_deviation(time_in_building_str, reason="", norm_hours=8, lunch_minutes=30):
|
||||
if pd.notna(reason) and isinstance(reason, str) and reason.strip() != "":
|
||||
"""
|
||||
Расчет отклонения от нормы.
|
||||
Для удаленщиков при наличии физического времени в здании вычисляется реальное отклонение.
|
||||
"""
|
||||
reason_clean = str(reason).strip().lower() if pd.notna(reason) else ""
|
||||
is_remote = "удален" in reason_clean or "дистанцион" in reason_clean
|
||||
|
||||
has_building_time = isinstance(time_in_building_str, str) and time_in_building_str not in ['00:00', '0', '', 'None', 'nan', 'NaN']
|
||||
|
||||
# Если есть уважительная причина (больничный, отпуск, командировка и т.д.) не удаленка
|
||||
if reason_clean != "" and not is_remote:
|
||||
return "0:00"
|
||||
|
||||
if not isinstance(time_in_building_str, str) or time_in_building_str in ['00:00', '0', '', 'None', 'nan', 'NaN']:
|
||||
# Если удаленщик работал исключительно из дома (00:00 в здании)
|
||||
if is_remote and not has_building_time:
|
||||
return "0:00"
|
||||
|
||||
# Если сотрудника не было в здании и нет уважительной причины
|
||||
if not has_building_time:
|
||||
return f"-{norm_hours}:00"
|
||||
|
||||
try:
|
||||
@@ -97,7 +114,7 @@ def calculate_deviation(time_in_building_str, reason="", norm_hours=8, lunch_min
|
||||
total_in_building_minutes = hh * 60 + mm
|
||||
|
||||
if total_in_building_minutes == 0:
|
||||
return f"-{norm_hours}:00"
|
||||
return "0:00" if is_remote else f"-{norm_hours}:00"
|
||||
|
||||
work_minutes = max(0, total_in_building_minutes - lunch_minutes)
|
||||
norm_minutes = norm_hours * 60
|
||||
@@ -113,29 +130,12 @@ def calculate_deviation(time_in_building_str, reason="", norm_hours=8, lunch_min
|
||||
|
||||
return f"{sign}{res_hh}:{res_mm:02d}"
|
||||
except Exception:
|
||||
return f"-{norm_hours}:00"
|
||||
return "0:00" if is_remote else f"-{norm_hours}:00"
|
||||
|
||||
|
||||
def apply_borders_to_cell(cell, border=THIN_BORDER):
|
||||
cell.border = border
|
||||
|
||||
|
||||
def format_row_cells(ws, r_num, fill_obj, is_bold=False, align_b="right", bold_font=None, wrap_b=False):
|
||||
cell_a = ws.cell(row=r_num, column=1)
|
||||
cell_b = ws.cell(row=r_num, column=2)
|
||||
if fill_obj:
|
||||
cell_a.fill = fill_obj
|
||||
cell_b.fill = fill_obj
|
||||
apply_borders_to_cell(cell_a)
|
||||
apply_borders_to_cell(cell_b)
|
||||
if is_bold and bold_font:
|
||||
cell_a.font = bold_font
|
||||
cell_b.font = bold_font
|
||||
if align_b:
|
||||
cell_b.alignment = Alignment(horizontal=align_b, vertical="center", wrap_text=wrap_b)
|
||||
|
||||
|
||||
# --- 1. СВОДКА НА СЕГОДНЯ ---
|
||||
# =============================================================================
|
||||
# 1. ЕЖЕДНЕВНАЯ СВОДКА НА СЕГОДНЯ
|
||||
# =============================================================================
|
||||
def generate_summary_excel(merged_df, date_str="21.08.2026", filename=None):
|
||||
date_clean = str(date_str).replace('_', '.')
|
||||
if not filename:
|
||||
@@ -143,65 +143,92 @@ def generate_summary_excel(merged_df, date_str="21.08.2026", filename=None):
|
||||
|
||||
target_dir = get_dated_reports_dir(date_clean)
|
||||
output_path = os.path.join(target_dir, filename)
|
||||
wb = Workbook()
|
||||
ws = wb.active
|
||||
ws.title = "Лист_1"
|
||||
|
||||
ws.sheet_properties.outlinePr.summaryBelow = False
|
||||
ws.sheet_properties.outlinePr.summaryRight = False
|
||||
ws.sheet_properties.outlinePr.showOutlineSymbols = True
|
||||
ws.sheet_view.showOutlineSymbols = True
|
||||
wb = xlsxwriter.Workbook(output_path)
|
||||
ws = wb.add_worksheet("Лист_1")
|
||||
|
||||
bold_font = Font(name="Calibri", size=11, bold=True)
|
||||
ws.outline_settings(visible=True, symbols_below=False, symbols_right=False, auto_style=False)
|
||||
|
||||
ws.cell(row=1, column=1, value="Сводка на")
|
||||
ws.cell(row=1, column=2, value=date_clean)
|
||||
format_row_cells(ws, 1, FILL_HEADER, is_bold=True, bold_font=bold_font)
|
||||
def make_fmt(bg_color=None, bold=False, align="left", wrap=False):
|
||||
d = {
|
||||
'font_name': 'Calibri',
|
||||
'font_size': 11,
|
||||
'bold': bold,
|
||||
'align': align,
|
||||
'valign': 'vcenter',
|
||||
'border': 1,
|
||||
'border_color': '#D3D3D3',
|
||||
'text_wrap': wrap
|
||||
}
|
||||
if bg_color:
|
||||
d['bg_color'] = bg_color
|
||||
return wb.add_format(d)
|
||||
|
||||
apply_borders_to_cell(ws.cell(row=2, column=1))
|
||||
apply_borders_to_cell(ws.cell(row=2, column=2))
|
||||
fmt_hdr_l = make_fmt(bg_color='#D9E1F2', bold=True, align="left")
|
||||
fmt_hdr_r = make_fmt(bg_color='#D9E1F2', bold=True, align="right")
|
||||
fmt_tot_l = make_fmt(bg_color='#F2F2F2', bold=True, align="left")
|
||||
fmt_tot_r = make_fmt(bg_color='#F2F2F2', bold=True, align="right")
|
||||
fmt_empty = make_fmt()
|
||||
|
||||
ws.cell(row=3, column=1, value="По списку")
|
||||
ws.cell(row=3, column=2, value=len(merged_df))
|
||||
format_row_cells(ws, 3, FILL_TOTAL_LIST, is_bold=True, bold_font=bold_font)
|
||||
ws.set_row(0, 20)
|
||||
ws.write(0, 0, "Сводка на", fmt_hdr_l)
|
||||
ws.write(0, 1, date_clean, fmt_hdr_r)
|
||||
|
||||
current_row = 4
|
||||
ws.set_row(1, 20)
|
||||
ws.write(1, 0, "", fmt_empty)
|
||||
ws.write(1, 1, "", fmt_empty)
|
||||
|
||||
ws.set_row(2, 20)
|
||||
ws.write(2, 0, "По списку", fmt_tot_l)
|
||||
ws.write(2, 1, len(merged_df), fmt_tot_r)
|
||||
|
||||
current_row = 3
|
||||
is_no_pass = merged_df['no_scud_pass'] == True if 'no_scud_pass' in merged_df.columns else False
|
||||
is_exc = merged_df.get('is_excluded', False) == True
|
||||
|
||||
# 1. Неизвестно (Раскрыто по умолчанию)
|
||||
unexplained = merged_df[
|
||||
(merged_df['Пришел'] == False) &
|
||||
(merged_df['Вид_отсутствия'].isna() | (merged_df['Вид_отсутствия'].astype(str).str.strip() == '')) &
|
||||
(~is_no_pass) &
|
||||
(~is_exc)
|
||||
]
|
||||
ws.cell(row=current_row, column=1, value="неизвестно")
|
||||
ws.cell(row=current_row, column=2, value=len(unexplained))
|
||||
format_row_cells(ws, current_row, FILL_UNEXPLAINED, is_bold=True, bold_font=bold_font)
|
||||
fmt_unexp_hl = make_fmt(bg_color='#FCE4D6', bold=True, align="left")
|
||||
fmt_unexp_hr = make_fmt(bg_color='#FCE4D6', bold=True, align="right")
|
||||
fmt_unexp_rl = make_fmt(bg_color='#FCE4D6', bold=False, align="left")
|
||||
fmt_unexp_rr = make_fmt(bg_color='#FCE4D6', bold=False, align="right")
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, "неизвестно", fmt_unexp_hl)
|
||||
ws.write(current_row, 1, len(unexplained), fmt_unexp_hr)
|
||||
current_row += 1
|
||||
|
||||
for fio in sorted(unexplained['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, FILL_UNEXPLAINED, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = False
|
||||
ws.set_row(current_row, 20, None, {'level': 1, 'hidden': False})
|
||||
ws.write(current_row, 0, fio, fmt_unexp_rl)
|
||||
ws.write(current_row, 1, "", fmt_unexp_rr)
|
||||
current_row += 1
|
||||
|
||||
no_pass_df = merged_df[is_no_pass] if 'no_scud_pass' in merged_df.columns else pd.DataFrame()
|
||||
ws.cell(row=current_row, column=1, value="Нет пропуска")
|
||||
ws.cell(row=current_row, column=2, value=len(no_pass_df))
|
||||
format_row_cells(ws, current_row, FILL_NO_PASS, is_bold=True, bold_font=bold_font)
|
||||
# 2. Нет пропуска (Раскрыто по умолчанию)
|
||||
no_pass_df = merged_df[is_no_pass & (~is_exc)] if 'no_scud_pass' in merged_df.columns else pd.DataFrame()
|
||||
fmt_np_hl = make_fmt(bg_color='#E1F5FE', bold=True, align="left")
|
||||
fmt_np_hr = make_fmt(bg_color='#E1F5FE', bold=True, align="right")
|
||||
fmt_np_rl = make_fmt(bg_color='#E1F5FE', bold=False, align="left")
|
||||
fmt_np_rr = make_fmt(bg_color='#E1F5FE', bold=False, align="right")
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, "Нет пропуска", fmt_np_hl)
|
||||
ws.write(current_row, 1, len(no_pass_df), fmt_np_hr)
|
||||
current_row += 1
|
||||
|
||||
if not no_pass_df.empty:
|
||||
for fio in sorted(no_pass_df['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, FILL_NO_PASS, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = False
|
||||
ws.set_row(current_row, 20, None, {'level': 1, 'hidden': False})
|
||||
ws.write(current_row, 0, fio, fmt_np_rl)
|
||||
ws.write(current_row, 1, "", fmt_np_rr)
|
||||
current_row += 1
|
||||
|
||||
# 3. Официальные отсутствия (Сотрудники из исключений при наличии документа 1С попадают сюда)
|
||||
reason_clean = merged_df['Вид_отсутствия'].astype(str).str.lower()
|
||||
is_remote_reason = reason_clean.str.contains('удален|дистанцион', regex=True, na=False)
|
||||
|
||||
@@ -209,55 +236,63 @@ def generate_summary_excel(merged_df, date_str="21.08.2026", filename=None):
|
||||
(merged_df['Пришел'] == False) &
|
||||
(merged_df['Вид_отсутствия'].notna()) &
|
||||
(~merged_df['Вид_отсутствия'].astype(str).str.startswith('Исключение')) &
|
||||
(~is_remote_reason) &
|
||||
(~is_exc)
|
||||
(~is_remote_reason)
|
||||
]
|
||||
absent_groups = absent_only.groupby('Вид_отсутствия')
|
||||
|
||||
for idx_cat, (cat_name, group) in enumerate(absent_groups):
|
||||
hex_color = CATEGORY_PASTEL_COLORS[idx_cat % len(CATEGORY_PASTEL_COLORS)]
|
||||
cat_fill = PatternFill(start_color=hex_color, end_color=hex_color, fill_type="solid")
|
||||
pastels = ['#FFF2CC', '#E1D5E7', '#E1F5FE', '#FFF0F5', '#FCF3CF']
|
||||
|
||||
ws.cell(row=current_row, column=1, value=cat_name)
|
||||
ws.cell(row=current_row, column=2, value=len(group))
|
||||
format_row_cells(ws, current_row, cat_fill, is_bold=True, bold_font=bold_font)
|
||||
for idx_cat, (cat_name, group) in enumerate(absent_groups):
|
||||
hex_c = pastels[idx_cat % len(pastels)]
|
||||
fmt_cat_hl = make_fmt(bg_color=hex_c, bold=True, align="left")
|
||||
fmt_cat_hr = make_fmt(bg_color=hex_c, bold=True, align="right")
|
||||
fmt_cat_rl = make_fmt(bg_color=hex_c, bold=False, align="left")
|
||||
fmt_cat_rr = make_fmt(bg_color=hex_c, bold=False, align="right")
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, cat_name, fmt_cat_hl)
|
||||
ws.write(current_row, 1, len(group), fmt_cat_hr)
|
||||
current_row += 1
|
||||
|
||||
for fio in sorted(group['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, cat_fill, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = True
|
||||
ws.set_row(current_row, 20, None, {'level': 1, 'hidden': True, 'collapsed': True})
|
||||
ws.write(current_row, 0, fio, fmt_cat_rl)
|
||||
ws.write(current_row, 1, "", fmt_cat_rr)
|
||||
current_row += 1
|
||||
|
||||
present = merged_df[(merged_df['Пришел'] == True) & (~is_exc)]
|
||||
ws.cell(row=current_row, column=1, value="Итого на работе")
|
||||
ws.cell(row=current_row, column=2, value=len(present))
|
||||
format_row_cells(ws, current_row, FILL_PRESENT, is_bold=True, bold_font=bold_font)
|
||||
# 4. Итого на работе (Только общее число, без раскрывающегося списка ФИО. Включает исключения без справок)
|
||||
exc_without_doc = merged_df[is_exc & (merged_df['Вид_отсутствия'].isna() | (merged_df['Вид_отсутствия'].astype(str).str.strip().isin(['', 'nan', 'Исключение'])))]
|
||||
present_scud = merged_df[(merged_df['Пришел'] == True) & (~is_exc)]
|
||||
|
||||
total_present_count = len(present_scud) + len(exc_without_doc)
|
||||
|
||||
fmt_pres_hl = make_fmt(bg_color='#E2EFDA', bold=True, align="left")
|
||||
fmt_pres_hr = make_fmt(bg_color='#E2EFDA', bold=True, align="right")
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, "Итого на работе", fmt_pres_hl)
|
||||
ws.write(current_row, 1, total_present_count, fmt_pres_hr)
|
||||
current_row += 1
|
||||
|
||||
if not present.empty:
|
||||
for fio in sorted(present['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, FILL_PRESENT, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = True
|
||||
current_row += 1
|
||||
|
||||
# 5. Удаленная работа (Свернуто)
|
||||
remote_home = merged_df[(merged_df['Пришел'] == False) & is_remote_reason & (~is_exc)]
|
||||
ws.cell(row=current_row, column=1, value="В том числе на удаленной работе")
|
||||
ws.cell(row=current_row, column=2, value=len(remote_home))
|
||||
format_row_cells(ws, current_row, FILL_REMOTE, is_bold=True, bold_font=bold_font)
|
||||
fmt_rem_hl = make_fmt(bg_color='#E8F8F5', bold=True, align="left")
|
||||
fmt_rem_hr = make_fmt(bg_color='#E8F8F5', bold=True, align="right")
|
||||
fmt_rem_rl = make_fmt(bg_color='#E8F8F5', bold=False, align="left")
|
||||
fmt_rem_rr = make_fmt(bg_color='#E8F8F5', bold=False, align="right")
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, "В том числе на удаленной работе", fmt_rem_hl)
|
||||
ws.write(current_row, 1, len(remote_home), fmt_rem_hr)
|
||||
current_row += 1
|
||||
|
||||
if not remote_home.empty:
|
||||
for fio in sorted(remote_home['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, FILL_REMOTE, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = True
|
||||
ws.set_row(current_row, 20, None, {'level': 1, 'hidden': True, 'collapsed': True})
|
||||
ws.write(current_row, 0, fio, fmt_rem_rl)
|
||||
ws.write(current_row, 1, "", fmt_rem_rr)
|
||||
current_row += 1
|
||||
|
||||
# 6. Аномалии СКУД и 1С (Свернуто)
|
||||
anomalies = merged_df[
|
||||
(~is_exc) & (
|
||||
((merged_df['Пришел'] == True) & (merged_df['Вид_отсутствия'].notna()) &
|
||||
@@ -267,10 +302,14 @@ def generate_summary_excel(merged_df, date_str="21.08.2026", filename=None):
|
||||
(merged_df.get('anomaly_flag', 'NONE') == 'ANOMALY_NO_IN_HAS_ACTIVITY')
|
||||
)
|
||||
]
|
||||
|
||||
ws.cell(row=current_row, column=1, value="Аномалии СКУД и 1С")
|
||||
ws.cell(row=current_row, column=2, value=len(anomalies))
|
||||
format_row_cells(ws, current_row, FILL_ANOMALY, is_bold=True, bold_font=bold_font)
|
||||
fmt_anom_hl = make_fmt(bg_color='#FCE4D6', bold=True, align="left")
|
||||
fmt_anom_hr = make_fmt(bg_color='#FCE4D6', bold=True, align="right")
|
||||
fmt_anom_rl = make_fmt(bg_color='#FCE4D6', bold=False, align="left")
|
||||
fmt_anom_rr = make_fmt(bg_color='#FCE4D6', bold=False, align="left", wrap=True)
|
||||
|
||||
ws.set_row(current_row, 20)
|
||||
ws.write(current_row, 0, "Аномалии СКУД и 1С", fmt_anom_hl)
|
||||
ws.write(current_row, 1, len(anomalies), fmt_anom_hr)
|
||||
current_row += 1
|
||||
|
||||
chars_per_line_b = 30
|
||||
@@ -285,50 +324,24 @@ def generate_summary_excel(merged_df, date_str="21.08.2026", filename=None):
|
||||
reason_text = f"🚨 АНОМАЛИЯ СКУД: Нет входа (первая активность: {first_act})"
|
||||
else:
|
||||
reason_text = f"В 1С: {reason}"
|
||||
|
||||
cell_a = ws.cell(row=current_row, column=1, value=f"{fio}")
|
||||
cell_b = ws.cell(row=current_row, column=2, value=reason_text)
|
||||
cell_a.fill = FILL_ANOMALY
|
||||
cell_b.fill = FILL_ANOMALY
|
||||
apply_borders_to_cell(cell_a)
|
||||
apply_borders_to_cell(cell_b)
|
||||
cell_b.alignment = Alignment(horizontal="left", vertical="center", wrap_text=True)
|
||||
cell_a.alignment = Alignment(horizontal="left", vertical="center")
|
||||
|
||||
|
||||
lines_count = math.ceil(len(reason_text) / chars_per_line_b) if len(reason_text) > chars_per_line_b else 1
|
||||
ws.row_dimensions[current_row].height = max(lines_count * 18, 20)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = True
|
||||
row_h = max(lines_count * 18, 20)
|
||||
|
||||
ws.set_row(current_row, row_h, None, {'level': 1, 'hidden': True, 'collapsed': True})
|
||||
ws.write(current_row, 0, fio, fmt_anom_rl)
|
||||
ws.write(current_row, 1, reason_text, fmt_anom_rr)
|
||||
current_row += 1
|
||||
|
||||
exceptions_df = merged_df[is_exc]
|
||||
ws.cell(row=current_row, column=1, value="Исключения")
|
||||
ws.cell(row=current_row, column=2, value=len(exceptions_df))
|
||||
format_row_cells(ws, current_row, FILL_EXCEPTIONS, is_bold=True, bold_font=bold_font)
|
||||
current_row += 1
|
||||
|
||||
if not exceptions_df.empty:
|
||||
for fio in sorted(exceptions_df['Сотрудник'].dropna().unique()):
|
||||
ws.cell(row=current_row, column=1, value=fio)
|
||||
format_row_cells(ws, current_row, FILL_EXCEPTIONS, is_bold=False)
|
||||
ws.row_dimensions[current_row].outlineLevel = 1
|
||||
ws.row_dimensions[current_row].hidden = True
|
||||
current_row += 1
|
||||
|
||||
ws.column_dimensions['A'].width = 45.0
|
||||
ws.column_dimensions['B'].width = 38.0
|
||||
|
||||
try:
|
||||
wb.save(output_path)
|
||||
print(f"[✓] Ежедневная сводка сохранена: {output_path}")
|
||||
except (PermissionError, OSError):
|
||||
alt_filename = filename.replace(".xlsx", f"_{int(time.time())}.xlsx")
|
||||
alt_path = os.path.join(target_dir, alt_filename)
|
||||
wb.save(alt_path)
|
||||
print(f"[⚠️] Файл открыт в Excel! Сохранено как: {alt_path}")
|
||||
ws.set_column(0, 0, 45)
|
||||
ws.set_column(1, 1, 38)
|
||||
|
||||
safe_close_workbook(wb, output_path, target_dir, filename)
|
||||
|
||||
|
||||
# --- 2. ДЕТАЛЬНЫЙ ОТЧЕТ ЗА ВЧЕРА (С ПРАВИЛОМ 8.5ч) ---
|
||||
# =============================================================================
|
||||
# 2. ДЕТАЛЬНЫЙ СУТОЧНЫЙ ОТЧЕТ ЗА ВЧЕРА
|
||||
# =============================================================================
|
||||
def generate_detailed_excel(merged_df, date_str="20.08.2026", filename=None):
|
||||
date_clean = str(date_str).replace('_', '.')
|
||||
if not filename:
|
||||
@@ -341,29 +354,37 @@ def generate_detailed_excel(merged_df, date_str="20.08.2026", filename=None):
|
||||
|
||||
target_dir = get_dated_reports_dir(date_clean)
|
||||
output_path = os.path.join(target_dir, filename)
|
||||
wb = Workbook()
|
||||
ws = wb.active
|
||||
ws.title = "Детальный_отчет"
|
||||
|
||||
ws["B2"] = "Дата:"
|
||||
ws["D2"] = date_clean
|
||||
ws["B2"].font = Font(name="Arial", size=10, bold=True)
|
||||
ws["D2"].font = Font(name="Arial", size=10, bold=True)
|
||||
wb = xlsxwriter.Workbook(output_path)
|
||||
ws = wb.add_worksheet("Детальный_отчет")
|
||||
|
||||
def make_fmt(bg_color=None, bold=False, align="left", wrap=False):
|
||||
d = {
|
||||
'font_name': 'Arial',
|
||||
'font_size': 10,
|
||||
'bold': bold,
|
||||
'align': align,
|
||||
'valign': 'vcenter',
|
||||
'border': 1,
|
||||
'border_color': '#D3D3D3',
|
||||
'text_wrap': wrap
|
||||
}
|
||||
if bg_color:
|
||||
d['bg_color'] = bg_color
|
||||
return wb.add_format(d)
|
||||
|
||||
fmt_date_lbl = wb.add_format({'font_name': 'Arial', 'font_size': 10, 'bold': True})
|
||||
ws.write(1, 1, "Дата:", fmt_date_lbl)
|
||||
ws.write(1, 3, date_clean, fmt_date_lbl)
|
||||
|
||||
headers = [
|
||||
"№", "ФИО", "Подразделение", "время входа", "первая активность", "время выхода",
|
||||
"находился в здании", "причина отсутствия", "норма", "отклонение от нормы"
|
||||
]
|
||||
ws.append([])
|
||||
ws.append(headers)
|
||||
|
||||
header_fill = PatternFill(start_color="D9E1F2", end_color="D9E1F2", fill_type="solid")
|
||||
for col_idx in range(1, len(headers) + 1):
|
||||
cell = ws.cell(row=4, column=col_idx)
|
||||
cell.fill = header_fill
|
||||
cell.font = Font(name="Arial", size=10, bold=True)
|
||||
cell.alignment = Alignment(horizontal="center", vertical="center", wrap_text=True)
|
||||
apply_borders_to_cell(cell)
|
||||
fmt_hdr = make_fmt(bg_color='#D9E1F2', bold=True, align="center", wrap=True)
|
||||
ws.set_row(3, 26)
|
||||
for col_idx, h_text in enumerate(headers):
|
||||
ws.write(3, col_idx, h_text, fmt_hdr)
|
||||
|
||||
start_col = 'Начало дня' if 'Начало дня' in df_export.columns else 'Начало_дня'
|
||||
end_col = 'Конец дня' if 'Конец дня' in df_export.columns else 'Конец_дня'
|
||||
@@ -372,6 +393,7 @@ def generate_detailed_excel(merged_df, date_str="20.08.2026", filename=None):
|
||||
chars_per_line_h = 24
|
||||
|
||||
for idx, row in df_export.reset_index(drop=True).iterrows():
|
||||
row_num = 4 + idx
|
||||
is_present = row.get('Пришел', False)
|
||||
absence_reason = row.get('Вид_отсутствия', '')
|
||||
has_reason = pd.notna(absence_reason) and str(absence_reason).strip() != ''
|
||||
@@ -382,7 +404,6 @@ def generate_detailed_excel(merged_df, date_str="20.08.2026", filename=None):
|
||||
first_act_val = str(row.get('Первая_активность', '—')).strip()
|
||||
has_first_act = first_act_val not in ['—', '', 'None', 'nan']
|
||||
|
||||
# ⭐️ ПРАВИЛО 8.5ч: если есть вход, но нет выхода (и нет официального документа отсутствия)
|
||||
if in_val not in ['Нет входа', '—', '', 'nan', 'None'] and out_val in ['Нет выхода', '—', '', 'nan', 'None'] and not has_reason:
|
||||
out_val, in_building_str, deviation_val = calculate_autoclose_time(in_val)
|
||||
else:
|
||||
@@ -390,60 +411,104 @@ def generate_detailed_excel(merged_df, date_str="20.08.2026", filename=None):
|
||||
|
||||
dept_scud_val = row.get('department_scud', row.get('department', row.get('Подразделение', '')))
|
||||
|
||||
ws.append([
|
||||
idx + 1,
|
||||
row.get('Сотрудник', ''),
|
||||
dept_scud_val,
|
||||
in_val,
|
||||
first_act_val,
|
||||
out_val,
|
||||
in_building_str,
|
||||
absence_reason if has_reason else '',
|
||||
8,
|
||||
deviation_val
|
||||
])
|
||||
|
||||
row_num = 5 + idx
|
||||
row_color = None
|
||||
if is_present and has_reason:
|
||||
row_fill = GREEN_FILL
|
||||
row_color = '#E2EFDA'
|
||||
elif not is_present and has_reason:
|
||||
row_fill = YELLOW_FILL
|
||||
row_color = '#FFF2CC'
|
||||
elif not is_present and not has_reason and not has_first_act:
|
||||
row_fill = LIGHT_RED_FILL
|
||||
else:
|
||||
row_fill = None
|
||||
row_color = '#FCE4D6'
|
||||
|
||||
val_h_str = str(absence_reason) if has_reason else ""
|
||||
lines_count = math.ceil(len(val_h_str) / chars_per_line_h) if len(val_h_str) > chars_per_line_h else 1
|
||||
ws.row_dimensions[row_num].height = max(lines_count * 18, 20)
|
||||
ws.set_row(row_num, max(lines_count * 18, 20))
|
||||
|
||||
for col_idx in range(1, len(headers) + 1):
|
||||
cell = ws.cell(row=row_num, column=col_idx)
|
||||
apply_borders_to_cell(cell)
|
||||
if row_fill:
|
||||
cell.fill = row_fill
|
||||
if col_idx == 8:
|
||||
cell.alignment = Alignment(horizontal="left", vertical="center", wrap_text=True)
|
||||
elif col_idx in [1, 4, 5, 6, 7, 9, 10]:
|
||||
cell.alignment = Alignment(horizontal="center", vertical="center")
|
||||
else:
|
||||
cell.alignment = Alignment(horizontal="left", vertical="center")
|
||||
values = [
|
||||
(idx + 1, 'center', False),
|
||||
(row.get('Сотрудник', ''), 'left', False),
|
||||
(dept_scud_val, 'center', False),
|
||||
(in_val, 'center', False),
|
||||
(first_act_val, 'center', False),
|
||||
(out_val, 'center', False),
|
||||
(in_building_str, 'center', False),
|
||||
(absence_reason if has_reason else '', 'left', True),
|
||||
(8, 'center', False),
|
||||
(deviation_val, 'center', False)
|
||||
]
|
||||
|
||||
for col in ws.columns:
|
||||
col_letter = get_column_letter(col[0].column)
|
||||
max_len = max((len(str(cell.value or '')) for cell in col), default=8)
|
||||
ws.column_dimensions[col_letter].width = min(max(max_len + 2, 8), 35)
|
||||
for col_idx, (val, align_type, is_wrap) in enumerate(values):
|
||||
fmt = make_fmt(bg_color=row_color, align=align_type, wrap=is_wrap)
|
||||
ws.write(row_num, col_idx, val, fmt)
|
||||
|
||||
try:
|
||||
wb.save(output_path)
|
||||
print(f"[✓] Детальный отчет сохранен: {output_path}")
|
||||
except (PermissionError, OSError):
|
||||
alt_filename = filename.replace(".xlsx", f"_{int(time.time())}.xlsx")
|
||||
alt_path = os.path.join(target_dir, alt_filename)
|
||||
wb.save(alt_path)
|
||||
print(f"[⚠️] Файл открыт в Excel! Сохранено как: {alt_path}")
|
||||
col_widths = {
|
||||
0: 4,
|
||||
1: 33,
|
||||
2: 13,
|
||||
3: 11,
|
||||
4: 11,
|
||||
5: 11,
|
||||
6: 12,
|
||||
7: 24,
|
||||
8: 6,
|
||||
9: 11
|
||||
}
|
||||
|
||||
for col_idx, width in col_widths.items():
|
||||
ws.set_column(col_idx, col_idx, width)
|
||||
|
||||
safe_close_workbook(wb, output_path, target_dir, filename)
|
||||
|
||||
|
||||
# =============================================================================
|
||||
# 3. СЫРОЙ СКУД
|
||||
# =============================================================================
|
||||
def export_raw_scud(df_scud, filename="СКУД_Сырые_данные.xlsx"):
|
||||
output_path = os.path.join(REPORTS_DIR, filename)
|
||||
df_scud.to_excel(output_path, index=False)
|
||||
target_dir = os.path.dirname(output_path)
|
||||
wb = xlsxwriter.Workbook(output_path)
|
||||
ws = wb.add_worksheet("Сырые_данные")
|
||||
|
||||
fmt_hdr = wb.add_format({
|
||||
'font_name': 'Calibri',
|
||||
'font_size': 11,
|
||||
'bold': True,
|
||||
'bg_color': '#D9E1F2',
|
||||
'border': 1,
|
||||
'border_color': '#D3D3D3',
|
||||
'align': 'center',
|
||||
'valign': 'vcenter'
|
||||
})
|
||||
fmt_cell = wb.add_format({
|
||||
'font_name': 'Calibri',
|
||||
'font_size': 11,
|
||||
'border': 1,
|
||||
'border_color': '#D3D3D3',
|
||||
'valign': 'vcenter',
|
||||
'align': 'left'
|
||||
})
|
||||
|
||||
headers = list(df_scud.columns)
|
||||
ws.set_row(3, 28)
|
||||
for col_idx, header in enumerate(headers):
|
||||
ws.write(0, col_idx, str(header), fmt_hdr)
|
||||
|
||||
col_widths = [len(str(h)) for h in headers]
|
||||
|
||||
for row_idx, row_values in enumerate(df_scud.values, start=1):
|
||||
ws.set_row(row_idx, 19)
|
||||
for col_idx, val in enumerate(row_values):
|
||||
if pd.isna(val) or val is None:
|
||||
val_str = ""
|
||||
elif isinstance(val, bool):
|
||||
val_str = "Да" if val else "Нет"
|
||||
else:
|
||||
val_str = str(val)
|
||||
|
||||
ws.write(row_idx, col_idx, val_str, fmt_cell)
|
||||
if len(val_str) > col_widths[col_idx]:
|
||||
col_widths[col_idx] = len(val_str)
|
||||
|
||||
for col_idx, width in enumerate(col_widths):
|
||||
ws.set_column(col_idx, col_idx, min(max(width + 3, 10), 45))
|
||||
|
||||
safe_close_workbook(wb, output_path, target_dir, filename)
|
||||
Reference in New Issue
Block a user