bpappbuilder 0.2.0__tar.gz → 0.3.0__tar.gz

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bpappbuilder
-Version: 0.2.0
+Version: 0.3.0
 Summary: Оболочка над PyQt для создания приложений, как в 1С:Предприятии, но на Python
 Author: AlexK-1
 License-Expression: MIT
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 
 ## TODOs
 - [X] Реализовать бизнес-процессы и задачи
-- [ ] Создать отчёты в виде календаря
+- [X] Создать отчёты в виде календаря
 - [ ] Добавить возможность делать поля невидимыми в формах/таблицах
 - [ ] Добавить возможность настраивать кнопки форм
 - [ ] Сделать автоматическое обновление вкладок

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/README.md

@@ -6,7 +6,7 @@
 
 ## TODOs
 - [X] Реализовать бизнес-процессы и задачи
-- [ ] Создать отчёты в виде календаря
+- [X] Создать отчёты в виде календаря
 - [ ] Добавить возможность делать поля невидимыми в формах/таблицах
 - [ ] Добавить возможность настраивать кнопки форм
 - [ ] Сделать автоматическое обновление вкладок

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "bpappbuilder"
-version = "0.2.0"
+version = "0.3.0"
 authors = [
   { name="AlexK-1" }
 ]

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/src/bpappbuilder/__init__.py

@@ -5,4 +5,4 @@ import bpappbuilder.tabs
 import bpappbuilder.processes
 
 # __all__ = ["App", "Fields", "Reports", "Tabs"]
-__version__ = "0.2.0"
+__version__ = "0.3.0"

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/src/bpappbuilder/reports/__init__.py

@@ -13,9 +13,12 @@ from .report import (
     LineChartReport,
     BarChartReport,
     PieChartReport,
+    CalendarColors,
+    CalendarReport,
     ReportTab
 )
 
 __all__ = ["ReportSettingsItem", "TextReportField", "GetTableWidget", "CreateTextReportHandler",
            "CreateTableReportHandler", "ReportSection", "TextReport", "ListReport", "TableTotalFn",
-           "TableTotal", "TableReport", "LineChartReport", "BarChartReport", "PieChartReport", "ReportTab"]
+           "TableTotal", "TableReport", "LineChartReport", "BarChartReport", "PieChartReport",
+           "CalendarColors", "CalendarReport", "ReportTab"]

{bpappbuilder-0.2.0 → bpappbuilder-0.3.0}/src/bpappbuilder/reports/report.py

@@ -1,17 +1,17 @@
 from PySide6.QtWidgets import (QWidget, QLabel, QSplitter, QGroupBox, QPushButton, QMessageBox,
                             QTableWidget, QHeaderView, QStyleOptionHeader, QTableView,
-                            QVBoxLayout, QLayout, QFormLayout)
+                            QVBoxLayout, QLayout, QFormLayout, QCalendarWidget)
 from PySide6.QtCharts import (QChart, QChartView, QScatterSeries, QLineSeries, QCategoryAxis,
                             QValueAxis, QBarSet, QBarSeries, QBarCategoryAxis, QPieSeries,
                             QPieSlice)
-from PySide6.QtCore import Qt, QRect, QAbstractTableModel, QModelIndex
-from PySide6.QtGui import QPainter
+from PySide6.QtCore import Qt, QRect, QAbstractTableModel, QModelIndex, QDate, QDateTime
+from PySide6.QtGui import QPainter, QColor, QPalette
 
 from ..app.db import DataBase
 from ..tabs.tab import Tab
 from ..tabs.table import FormFieldWidget
 from ..tabs.table_tab import TableTab
-from ..fields.field import Field
+from ..fields.field import Field, DateTimeField
 
 from typing import Optional, Union, Sequence, Any, Callable, Iterable
 from abc import ABC, abstractmethod
@@ -898,6 +898,100 @@ class PieChartReport(ReportSection):
         return widget 
 
 
+class CalendarColors:
+    Blue = (QColor(52, 132, 207), QColor(38, 121, 199))
+    Green = (QColor(65, 243, 71), QColor(63, 235, 66))
+    Red = (QColor(243, 65, 65), QColor(228, 62, 62))
+
+class CalendarReportWidget(QCalendarWidget):
+    def __init__(self, enabled_dates: dict[str, Union[str, None]], color: CalendarColors):
+        super().__init__()
+
+        self.enabled_dates = enabled_dates
+        self.color = color
+
+        print(enabled_dates)
+
+    def paintCell(self, painter: QPainter, rect: QRect, date: QDate):
+        super().paintCell(painter, rect, date)
+
+        date_str = date.toString(DateTimeField.date_format)
+
+        if date_str in self.enabled_dates.keys() or date == self.selectedDate():
+            if date == self.selectedDate():
+                if date_str in self.enabled_dates.keys():
+                    painter.fillRect(rect, self.color[1])
+                else:
+                    painter.fillRect(rect, self.palette().color(QPalette.ColorRole.Midlight))
+            elif date_str in self.enabled_dates.keys():
+                painter.fillRect(rect, self.color[0])
+                    
+            # if date != self.selectedDate():
+            #     painter.fillRect(rect, self.color[0])
+            # elif date_str in self.enabled_dates.keys():
+            #     painter.fillRect(rect, self.color[1])
+            # else:
+            #     painter.fillRect(rect, self.palette().color(QPalette.ColorRole.Midlight))
+            painter.drawText(rect, Qt.AlignmentFlag.AlignCenter, str(date.day()))
+        
+    def eventFilter(self, obj: QObject, event: QEvent) -> bool:
+        if obj is self and event.type() == QEvent.Type.ToolTip:
+            pos: QPoint = event.pos()
+            date = self.get_date_at_position(pos)
+            date_str = date.toString(DateTimeField.date_format)
+            
+            if date_str in self.enabled_dates.keys() and self.enabled_dates[date_str] is not None:
+                print(self.enabled_dates[date_str])
+                QToolTip.showText(self.mapToGlobal(pos), self.enabled_dates[date_str], self)
+        return super().eventFilter(obj, event)
+
+    def get_date_at_position(self, pos: QPoint) -> QDate:
+        table_view: QTableView = self.findChild(QTableView)
+        if not table_view:
+            return QDate()
+        
+        table_pos = table_view.mapFrom(self, pos)
+        
+        index = table_view.indexAt(table_pos)
+        if not index.isValid():
+            return QDate()
+        
+        return self.get_date_from_index(index.row()-1, index.column()-1)
+
+    def get_date_from_index(self, row: int, column: int) -> QDate:
+        year = self.yearShown()
+        month = self.monthShown()
+
+        first_day = QDate(year, month, 1)
+        offset = (first_day.dayOfWeek() - self.firstDayOfWeek().value) % 7
+
+        start_date = first_day.addDays(-offset)
+
+        if offset == 0:
+            start_date = start_date.addDays(-7)
+
+        return start_date.addDays(row * 7 + column)
+
+class CalendarReport(ReportSection):
+    def __init__(self, sql_request: str, date: str, values: Optional[str] = None,
+                 color: CalendarColors = CalendarColors.Blue, stretch: int = 0):
+        super().__init__(sql_request, stretch)
+        self.date = date
+        self.values = values
+        self.color = color
+
+    def create_widget(self, settings: dict[str, ReportSettingsItem]):
+        request = self.generate_sql_request(settings)
+        db_data = self.db.cur.execute(request, {k: v.data for k, v in settings.items()}).fetchall()
+
+        if self.values is not None:
+            widget = CalendarReportWidget({row[self.date]:str(row[self.values]) for row in db_data}, self.color)
+        else:
+            widget = CalendarReportWidget({row[self.date]:None for row in db_data}, self.color)
+
+        return widget
+
+
 class ReportTab(Tab):
     """
     Вкладка отчёта. Отчёт представляет собой структурированные в виде