kolo/DutyLog
1
0
Fork 0
mirror of https://github.com/koloideal/DutyLog.git synced 2026-08-08 18:11:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
kolo
2026-03-17 20:12:29 +03:00
parent e796a5bfdd
commit d05f9c3042
14 changed files with 188 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dutylog/services/report_service.py
+7 -113
View File
@@ -10,9 +10,6 @@ from dutylog.infrastructure.database.repositories.floors_repository import (
from dutylog.infrastructure.database.repositories.hours_transactions_repository import (
HoursTransactionsRepository,
)
from dutylog.infrastructure.database.repositories.room_hours_transactions_repository import (
RoomHoursTransactionsRepository,
)
from dutylog.infrastructure.database.repositories.residents_repository import (
ResidentsRepository,
)
@@ -30,27 +27,26 @@ class ReportService:
def __init__(
self,
hours_transactions_repository: HoursTransactionsRepository,
room_hours_transactions_repository: RoomHoursTransactionsRepository,
residents_repository: ResidentsRepository,
rooms_repository: RoomsRepository,
floors_repository: FloorsRepository,
users_repository: UsersRepository,
):
self.hours_transactions_repository = hours_transactions_repository
self.room_hours_transactions_repository = room_hours_transactions_repository
self.residents_repository = residents_repository
self.rooms_repository = rooms_repository
self.floors_repository = floors_repository
self.users_repository = users_repository
async def generate_period_report(self, start_date: date, end_date: date) -> BytesIO:
resident_transactions = await self.hours_transactions_repository.get_by_period(
start_date, end_date
)
room_transactions = await self.room_hours_transactions_repository.get_by_period(
all_transactions = await self.hours_transactions_repository.get_by_period(
start_date, end_date
)
# Разделяем транзакции на личные и комнатные
resident_transactions = [t for t in all_transactions if not t.per_room]
room_transactions = [t for t in all_transactions if t.per_room]
resident_increase = [
t for t in resident_transactions if t.transaction_type == "increase"
]
@@ -71,8 +67,8 @@ class ReportService:
await self._create_resident_sheet(wb, "Резиденты - Начисления", resident_increase, start_date, end_date)
await self._create_resident_sheet(wb, "Резиденты - Списания", resident_decrease, start_date, end_date)
await self._create_room_sheet(wb, "Комнаты - Начисления", room_increase, start_date, end_date)
await self._create_room_sheet(wb, "Комнаты - Списания", room_decrease, start_date, end_date)
await self._create_resident_sheet(wb, "Комнаты - Начисления", room_increase, start_date, end_date)
await self._create_resident_sheet(wb, "Комнаты - Списания", room_decrease, start_date, end_date)
output = BytesIO()
wb.save(output)
@@ -182,105 +178,3 @@ class ReportService:
ws.column_dimensions["D"].width = 10
ws.column_dimensions["E"].width = 15
ws.column_dimensions["F"].width = 30
async def _create_room_sheet(self, wb: Workbook, title: str, transactions, start_date: date, end_date: date):
ws = wb.create_sheet(title=title)
header_font = Font(bold=True, size=12, color="FFFFFF")
header_fill = PatternFill(
start_color="4472C4", end_color="4472C4", fill_type="solid"
)
header_alignment = Alignment(horizontal="center", vertical="center")
summary_font = Font(bold=True, size=11)
summary_fill = PatternFill(
start_color="E7E6E6", end_color="E7E6E6", fill_type="solid"
)
border = Border(
left=Side(style="thin"),
right=Side(style="thin"),
top=Side(style="thin"),
bottom=Side(style="thin"),
)
title_text = f"{title} за период {start_date.strftime('%d.%m.%Y')} - {end_date.strftime('%d.%m.%Y')}"
ws.cell(row=1, column=1, value=title_text)
ws.merge_cells("A1:F1")
title_cell = ws.cell(row=1, column=1)
title_cell.font = Font(bold=True, size=14)
title_cell.alignment = Alignment(horizontal="center", vertical="center")
ws.row_dimensions[1].height = 25
row_num = 3
headers = ["Дата", "Комната", "Этаж", "Часы", "Админ", "Примечание"]
for col_num, header in enumerate(headers, 1):
cell = ws.cell(row=row_num, column=col_num)
cell.value = header
cell.font = header_font
cell.fill = header_fill
cell.alignment = header_alignment
cell.border = border
ws.row_dimensions[row_num].height = 20
row_num += 1
total = 0
for transaction in transactions:
room = await self.rooms_repository.get_by_id(transaction.room_id)
if not room:
continue
floor = await self.floors_repository.get_by_id(room.on_floor)
floor_number = floor.number if floor else "—"
admin_username = "—"
if transaction.admin_id:
admin = await self.users_repository.get_user_by_id(transaction.admin_id)
if admin and admin.username:
admin_username = f"@{admin.username}"
msk_time = transaction.created_at.astimezone(MSK_TZ).replace(tzinfo=None)
ws.cell(row=row_num, column=1, value=msk_time).border = border
ws.cell(row=row_num, column=1).number_format = "DD.MM.YYYY HH:MM"
ws.cell(row=row_num, column=2, value=room.number).border = border
ws.cell(row=row_num, column=3, value=floor_number).border = border
ws.cell(row=row_num, column=4, value=transaction.amount).border = border
ws.cell(row=row_num, column=5, value=admin_username).border = border
ws.cell(row=row_num, column=6, value=transaction.remark or "—").border = border
ws.cell(row=row_num, column=1).alignment = Alignment(horizontal="center")
ws.cell(row=row_num, column=2).alignment = Alignment(horizontal="center")
ws.cell(row=row_num, column=3).alignment = Alignment(horizontal="center")
ws.cell(row=row_num, column=4).alignment = Alignment(horizontal="center")
total += transaction.amount
row_num += 1
summary_row = row_num
ws.merge_cells(f"A{summary_row}:C{summary_row}")
summary_cell = ws[f"A{summary_row}"]
summary_cell.value = "Итого часов:"
summary_cell.font = summary_font
summary_cell.fill = summary_fill
summary_cell.alignment = Alignment(horizontal="right", vertical="center")
summary_cell.border = border
ws.cell(row=summary_row, column=4, value=total).font = summary_font
ws.cell(row=summary_row, column=4).fill = summary_fill
ws.cell(row=summary_row, column=4).alignment = Alignment(horizontal="center")
ws.cell(row=summary_row, column=4).border = border
ws.cell(row=summary_row, column=5, value="").fill = summary_fill
ws.cell(row=summary_row, column=5).border = border
ws.cell(row=summary_row, column=6, value="").fill = summary_fill
ws.cell(row=summary_row, column=6).border = border
ws.column_dimensions["A"].width = 18
ws.column_dimensions["B"].width = 10
ws.column_dimensions["C"].width = 10
ws.column_dimensions["D"].width = 10
ws.column_dimensions["E"].width = 15
ws.column_dimensions["F"].width = 30