From f81ec7bba4c7eec963276c43b9fb317664f6f0da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=A6=D0=BE=D0=B9?= Date: Sun, 8 Dec 2024 09:18:02 +0900 Subject: [PATCH] Bot ended --- .drone.yml | 18 +++++++++--------- bot/utils/pdf_report.py | 18 +++++++++--------- reports/Golden Hills 4*_report.pdf | Bin 14335 -> 14442 bytes 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2e1d6bb7..89e94830 100644 --- a/.drone.yml +++ b/.drone.yml @@ -31,15 +31,15 @@ steps: - sleep 5 # Ждём, чтобы бот запустился - python test_bot.py # Проверка работы бота -services: - # Шаг 3: Сервис базы данных MySQL - - name: mysql - image: mysql:8 - environment: - MYSQL_ROOT_PASSWORD: R0sebud - MYSQL_USER: user - MYSQL_PASSWORD: password - MYSQL_DATABASE: w1510415_wp832 +# services: +# # Шаг 3: Сервис базы данных MySQL +# - name: mysql +# image: mysql:8 +# environment: +# MYSQL_ROOT_PASSWORD: R0sebud +# MYSQL_USER: user +# MYSQL_PASSWORD: password +# MYSQL_DATABASE: w1510415_wp832 trigger: event: diff --git a/bot/utils/pdf_report.py b/bot/utils/pdf_report.py index ac25ce51..414c44b8 100644 --- a/bot/utils/pdf_report.py +++ b/bot/utils/pdf_report.py @@ -28,14 +28,14 @@ def generate_pdf_report(hotel_name, reservations, start_date, end_date): pdf.ln(10) # Ширины колонок - page_width = pdf.w - 20 + page_width = pdf.w - 10 col_widths = [page_width * 0.2, page_width * 0.2, page_width * 0.15, page_width * 0.25, page_width * 0.1, page_width * 0.1] # Заголовки таблицы pdf.set_font("OpenSans", size=10) headers = ["Дата заезда", "Дата выезда", "Номер", "Тип комнаты", "Цена", "Скидка"] for width, header in zip(col_widths, headers): - pdf.cell(width, 10, header, border=1, align="C") + pdf.cell(width, 15, header, border=1, align="C") pdf.ln() total_price = 0 @@ -47,19 +47,19 @@ def generate_pdf_report(hotel_name, reservations, start_date, end_date): total_price += price total_discount += discount - pdf.cell(col_widths[0], 10, res.check_in.strftime('%d.%m.%Y'), border=1) - pdf.cell(col_widths[1], 10, res.check_out.strftime('%d.%m.%Y'), border=1) + pdf.cell(col_widths[0], 10, res.check_in.strftime('%d.%m.%Y %H:%M'), border=1) + pdf.cell(col_widths[1], 10, res.check_out.strftime('%d.%m.%Y %H:%M'), border=1) pdf.cell(col_widths[2], 10, res.room_number, border=1) pdf.cell(col_widths[3], 10, res.room_type, border=1) - pdf.cell(col_widths[4], 10, f"{price:.2f} ₽", border=1, align="R") - pdf.cell(col_widths[5], 10, f"{discount:.2f} ₽", border=1, align="R") + pdf.cell(col_widths[4], 10, f"{price:.2f} р.", border=1, align="R") + pdf.cell(col_widths[5], 10, f"{discount:.2f} р.", border=1, align="R") pdf.ln() pdf.ln(5) - pdf.set_font("OpenSans", size=12) + pdf.set_font("OpenSans", size=18) pdf.cell(0, 10, "Итоги:", ln=True) - pdf.cell(0, 10, f"Общая сумма цен: {total_price:.2f} ₽", ln=True) - pdf.cell(0, 10, f"Общая сумма скидок: {total_discount:.2f} ₽", ln=True) + pdf.cell(0, 10, f"Общая сумма цен: {total_price:.2f} руб.", ln=True) + pdf.cell(0, 10, f"Общая сумма скидок: {total_discount:.2f} руб. ", ln=True) file_path = os.path.join("reports", f"{hotel_name}_report.pdf") os.makedirs(os.path.dirname(file_path), exist_ok=True) diff --git a/reports/Golden Hills 4*_report.pdf b/reports/Golden Hills 4*_report.pdf index acdfa7d653b0c118c45f2747ea8c5c8b575de40f..62d124c2ebf99342f785fa52af6443cbe254b11d 100644 GIT binary patch delta 1685 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