zeed-movs-viewer 0.0.1__py3-none-any.whl → 0.0.2__py3-none-any.whl

movsviewer/automation.py

@@ -37,13 +37,13 @@ logger = getLogger(__name__)
 
 
 def get_options(dtemp: str) -> Options:
-    options = Options()
-
-    options.profile = FirefoxProfile()
+    profile = FirefoxProfile()
     # set download folder
-    options.profile.set_preference('browser.download.folderList', 2)
-    options.profile.set_preference('browser.download.dir', dtemp)
+    profile.set_preference('browser.download.folderList', 2)
+    profile.set_preference('browser.download.dir', dtemp)
 
+    options = Options()
+    options.profile = profile
     return options
 
 

movsviewer/chartview.py

@@ -231,7 +231,7 @@ class Chart(QChart):
         self.scroll(x_prev - x_curr, y_curr - y_prev)
 
 
-MONEY_HEADER = ColumnHeader('money')
+MONEY_HEADER = ColumnHeader('money', '€')
 
 
 @dataclass

movsviewer/mainui.py

@@ -8,7 +8,6 @@ from guilib.chartwidget.viewmodel import (
     SortFilterViewModel as SortFilterViewModel2,
 )
 from guilib.multitabs.widget import MultiTabs
-from guilib.qwtplot.plot import Plot
 from guilib.searchsheet.widget import SearchSheet
 from PySide6.QtCore import QCoreApplication
 from PySide6.QtCore import QItemSelection
@@ -30,6 +29,7 @@ from PySide6.QtWidgets import QWidget
 
 from movsviewer.constants import MAINUI_UI_PATH
 from movsviewer.constants import SETTINGSUI_UI_PATH
+from movsviewer.plotutils import PlotAndSliderWidget
 from movsviewer.plotutils import load_infos
 from movsviewer.settings import Settings
 from movsviewer.validator import Validator
@@ -142,7 +142,7 @@ class NewMainui:
         for data_path in data_paths:
             sheet, model = self.new_search_sheet(data_path)
             model2 = SortFilterViewModel2()
-            plot = Plot(model2, None)
+            plot = PlotAndSliderWidget(model2, None)
             model2.update(load_infos((data_path, 'money')))
             idx = self.multi_tabs.add_double_box(sheet, plot, model.name)
             self.sheets_charts[data_path] = (sheet, model2, idx)

movsviewer/plotutils.py

@@ -1,27 +1,45 @@
 from collections import defaultdict
 from datetime import date
+from datetime import timedelta
 from itertools import accumulate
 from operator import attrgetter
 from typing import TYPE_CHECKING
 
+from guilib.chartslider.chartslider import ChartSlider
 from guilib.chartwidget.model import Column
 from guilib.chartwidget.model import ColumnHeader
 from guilib.chartwidget.model import ColumnProto
 from guilib.chartwidget.model import Info
 from guilib.chartwidget.model import InfoProto
-from movslib.movs import read_txt
+from guilib.qwtplot.plot import Plot
+from movslib.reader import read
+from PySide6.QtWidgets import QVBoxLayout
+from PySide6.QtWidgets import QWidget
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
     from decimal import Decimal
 
+    from guilib.chartwidget.viewmodel import SortFilterViewModel
     from movslib.model import Row
     from movslib.model import Rows
 
 
+def _acc_reset_by_year(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
+    def func(a: tuple[date, 'Decimal'], b: 'Row') -> tuple[date, 'Decimal']:
+        if b.date.year != a[0].year:
+            return b.date, b.money
+
+        return b.date, a[1] + b.money
+
+    it = iter(sorted(rows, key=attrgetter('date')))
+    head = next(it)
+    return accumulate(it, func, initial=(head.date, head.money))
+
+
 def _acc(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
-    def func(a: 'tuple[date, Decimal]', b: 'Row') -> 'tuple[date, Decimal]':
-        return (b.date, a[1] + b.money)
+    def func(a: tuple[date, 'Decimal'], b: 'Row') -> tuple[date, 'Decimal']:
+        return b.date, a[1] + b.money
 
     it = iter(sorted(rows, key=attrgetter('date')))
     head = next(it)
@@ -31,8 +49,42 @@ def _acc(rows: 'Rows') -> 'Iterable[tuple[date, Decimal]]':
 def load_infos(*fn_names: tuple[str, str]) -> list[InfoProto]:
     tmp = defaultdict[date, list[ColumnProto]](list)
     for fn, name in fn_names:
-        _, rows = read_txt(fn, name)
-        ch = ColumnHeader(rows.name)
+        _, rows = read(fn, name)
+
+        ch = ColumnHeader(rows.name, '€')
         for d, m in _acc(rows):
             tmp[d].append(Column(ch, m))
-    return [Info(d, tmp[d]) for d in sorted(tmp)]
+
+        ch_year = ColumnHeader(f'{rows.name} (by year)', '€')
+        for d, m in _acc_reset_by_year(rows):
+            tmp[d].append(Column(ch_year, m))
+
+    sorted_days = sorted(tmp)
+
+    # add +/- 1 months of padding
+    ret: list[InfoProto] = []
+    ret.append(Info(sorted_days[0] - timedelta(days=30), []))
+    ret.extend(Info(d, tmp[d]) for d in sorted_days)
+    ret.append(Info(sorted_days[-1] + timedelta(days=30), []))
+
+    return ret
+
+
+class PlotAndSliderWidget(QWidget):
+    """Composition of a Plot and a (Chart)Slider."""
+
+    def __init__(
+        self, model: 'SortFilterViewModel', parent: QWidget | None
+    ) -> None:
+        super().__init__(parent)
+
+        plot = Plot(model, self)
+        chart_slider = ChartSlider(model, self, dates_column=0)
+
+        layout = QVBoxLayout(self)
+        layout.addWidget(plot)
+        layout.addWidget(chart_slider)
+        self.setLayout(layout)
+
+        chart_slider.start_date_changed.connect(plot.start_date_changed)
+        chart_slider.end_date_changed.connect(plot.end_date_changed)

{zeed_movs_viewer-0.0.1.dist-info → zeed_movs_viewer-0.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zeed-movs-viewer
-Version: 0.0.1
+Version: 0.0.2
 License:                     GNU AFFERO GENERAL PUBLIC LICENSE
                                 Version 3, 19 November 2007
          

{zeed_movs_viewer-0.0.1.dist-info → zeed_movs_viewer-0.0.2.dist-info}/RECORD

@@ -1,17 +1,17 @@
 movsviewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-movsviewer/automation.py,sha256=Q9MqPP8d9iUx-DAJOYYT2taCIlqA1elK2NHPNiYBTNQ,4390
-movsviewer/chartview.py,sha256=UkoYhrlCtcD4Iw62TRUD0wYPPKaVD7Suj18nwx-lH5I,12716
+movsviewer/automation.py,sha256=tG-jeA7sBt3bnIykb573_Ni5rVcXms2dg10j7Mk1n_I,4395
+movsviewer/chartview.py,sha256=dcuN2eBbn0GO5asl5PXUPRfMQIV3ZgddKvw4M_nHfrs,12723
 movsviewer/constants.py,sha256=kCLimJp-KQV1Bfp1FM8Re9l-bPcvrgblkqhFQWSWPjM,441
-movsviewer/mainui.py,sha256=buFop4EHSx7lbYN12OvzLHHCLGXRz9FrqsMy7KnxaM4,5972
-movsviewer/plotutils.py,sha256=AxiRJT2FKoBfiYqvudWJum8ku5XpKUDzXupcH2iw_T4,1251
+movsviewer/mainui.py,sha256=avemk_BUzDI-lWvXKJCNevovnN2QsfWE9tfEjej0C5k,6003
+movsviewer/plotutils.py,sha256=B2c1PdhqbfKmtSY8eZ6eNqcqZHxRhDmitxfirOIR9Zo,2921
 movsviewer/resources/geckodriver.exe,sha256=CCfcGwdNLMMpCWKc05nDO-3q6C88o3sEllUGV4HDGLM,3300792
 movsviewer/resources/mainui.ui,sha256=lCMfw4A0KkVw9KP14raCaGzDKc7Hx2W8OexZxT3npQk,1376
 movsviewer/resources/settingsui.ui,sha256=6eH5C9rkNrPlyp3JCQSW06drKhepwdQ0la4VGiqmPvE,3369
 movsviewer/settings.py,sha256=7O40YUefwAJA6cQtodzhesPbJHf_1SYhD_R1UfxKfyQ,1466
 movsviewer/validator.py,sha256=lyt8mEMWmW520OKsqoWP0P-B8pAbrDRx_NSNn58-kEg,916
 movsviewer/viewmodel.py,sha256=Gyp96Ag3nbwXzgyQaDKguX08U4DjY3hAzkFnY17ku30,5236
-zeed_movs_viewer-0.0.1.dist-info/METADATA,sha256=sTLvDXpilitcVJSaX6eLuDkQN_S_WRKYuEV4sziNnlg,41098
-zeed_movs_viewer-0.0.1.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-zeed_movs_viewer-0.0.1.dist-info/entry_points.txt,sha256=Cr9WqD8tBOMTJBuMV6-ayk_L49BmMfrKyZLk51-0008,71
-zeed_movs_viewer-0.0.1.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
-zeed_movs_viewer-0.0.1.dist-info/RECORD,,
+zeed_movs_viewer-0.0.2.dist-info/METADATA,sha256=xwRXslJBZYXY_VHYwP0etbCvkZgVynlZXavNbATHoKA,41098
+zeed_movs_viewer-0.0.2.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+zeed_movs_viewer-0.0.2.dist-info/entry_points.txt,sha256=Cr9WqD8tBOMTJBuMV6-ayk_L49BmMfrKyZLk51-0008,71
+zeed_movs_viewer-0.0.2.dist-info/licenses/LICENSE,sha256=hIahDEOTzuHCU5J2nd07LWwkLW7Hko4UFO__ffsvB-8,34523
+zeed_movs_viewer-0.0.2.dist-info/RECORD,,

{zeed_movs_viewer-0.0.1.dist-info → zeed_movs_viewer-0.0.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.3)
+Generator: pdm-backend (2.4.5)
 Root-Is-Purelib: true
 Tag: py3-none-any