P1-3

.github/workflows/ci.yml

@@ -11,14 +11,14 @@ on:
   pull_request:
 
 jobs:
-  build_package_lint_check:
-    name: Build, package, lint, check
+  ensure_build_package:
+    name: Ensure build and package
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.9"
           cache: "pip"
       - name: Setup, build, install
         run: |
@@ -29,19 +29,32 @@ jobs:
         run: qgis-plugin-ci --no-validation package 'test'
       - name: Lint
         run: black . --check
+      - name: Check
+        run: pyright . > pyright_report.txt
+        continue-on-error: true
+      - uses: actions/upload-artifact@v4
+        with:
+          name: Pyright Report
+          path: pyright_report.txt
 
   test:
-    name: Test
     runs-on: ubuntu-22.04
-    timeout-minutes: 15
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+      matrix:
+        postgis_versions:
+          - 12-3.4
+          - 15-3.4
+    name: Test with PostGIS v. ${{ matrix.postgis_versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Start docker stack
-        run: docker compose up db -d
+        run: POSTGIS_VERSION=${{ matrix.postgis_versions }} docker compose up db -d
       - name: Running tests
-        run: docker compose run qgis_tester
+        run: POSTGIS_VERSION=${{ matrix.postgis_versions }} docker compose run qgis_tester
       - name: Upload test coverage report
         uses: actions/upload-artifact@v4
         with:
-          name: coverage_report.txt
-          path: testoutputs/coverage_report.txt
+          name: coverage_report-${{ matrix.postgis_versions }}.txt
+          path: test_outputs/coverage_report.txt

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.9"
           cache: "pip"
 
       - name: Setup
@@ -28,7 +28,7 @@ jobs:
         id: package
         run: |
           latest_tag=${GITHUB_REF#refs/*/}
-          qgis-plugin-ci package $latest_tag
+          qgis-plugin-ci --no-validation package $latest_tag
           echo "latest_tag=${latest_tag}" >> $GITHUB_OUTPUT
 
       - name: Upload binaries to release

.gitignore

@@ -1,11 +1,19 @@
 **/__pycache__/
 **/coverage_report.txt
+test_outputs/
 *.nix
 *.log
 .venv/
 .vscode/
 .docker/tests/
 .docker/tests/screenshot.png
+/test_outputs
 .env
+.vscode/
+shell.nix
+Pipfile
+/test_outputs
+*.nix
+*.log
 .idea
-.coverage
+.coverage

comptages/__init__.py

@@ -46,7 +46,7 @@ def prepare_django(default_db=None, **additional_settings):
         USE_TZ=True,
         TIME_ZONE="Europe/Zurich",
         SECRET_KEY="09n+dhzh+02+_#$!1+8h-&(s-wbda#0*2mrv@lx*y#&fzlv&l)",
-        **additional_settings
+        **additional_settings,
     )
     django.setup()
 

comptages/comptages.py

@@ -1,6 +1,6 @@
 import os
 import pytz
-from datetime import datetime, timedelta
+from datetime import date, datetime, timedelta
 from functools import partial
 
 from qgis.PyQt.QtGui import QIcon
@@ -20,7 +20,8 @@
 from comptages.core.filter_dialog import FilterDialog
 from comptages.core.yearly_report_dialog import YearlyReportDialog
 from comptages.core.delete_dialog import DeleteDialog
-from comptages.core.utils import push_info
+from comptages.core.utils import push_info, push_error
+from comptages.core.statistics import get_valid_days
 from comptages.datamodel import models
 from comptages.core import importer, importer_task, report, report_task
 from comptages.chart.chart_dialog import ChartDock
@@ -29,8 +30,11 @@
 from comptages.report.yearly_report_bike import YearlyReportBike
 from comptages.ics.ics_importer import IcsImporter
 from comptages.ui.resources import *
+from comptages.ui.select_reports import SelectSectionsToReport
 from comptages.core import definitions
 
+from django.core.management import call_command
+
 
 class Comptages(QObject):
     def __init__(self, iface):
@@ -389,6 +393,7 @@ def do_yearly_report_action(self):
             selected_feature = next(layer.getSelectedFeatures())
 
         section_id = selected_feature.attribute("id")
+        section = models.Section.objects.get(id=section_id)
 
         classes = self.layers.get_classes_of_section(section_id)
         dlg = YearlyReportDialog(self.iface)
@@ -421,13 +426,21 @@ def do_yearly_report_action(self):
                 Qgis.Info,
             )
 
+            # Do not proceed unless the number of processed days exceeds 100 days
+            valid_days = get_valid_days(year, section)
+            if valid_days < 100:
+                push_error(
+                    f"This section ({section_id}) lacks valid days for this year ({year}). Found only {valid_days} out of 100."
+                )
+                return
+
             if clazz.startswith("SPCH-MD"):
                 yrb = YearlyReportBike(file_path, year, section_id)
                 yrb.run()
             else:
                 self.tm.allTasksFinished.connect(
-                    partial(self.all_tasks_finished, report)
-                )  # FIXME `report` is a mystery.
+                    partial(self.all_tasks_finished, "report")
+                )
 
                 # TODO: consider the chosed class too
                 self.tm.addTask(
@@ -440,6 +453,12 @@ def do_yearly_report_action(self):
                 )
             # TODO: check if there are comptages for this section and year
 
+        QgsMessageLog.logMessage(
+            "{} - Generate yearly report action ended".format(datetime.now()),
+            "Comptages",
+            Qgis.Info,
+        )
+
     def do_import_ics_action(self):
         IcsImporter(self.layers)
 
@@ -515,34 +534,51 @@ def do_generate_report_action(self, count_id):
             return
 
         file_dialog = QFileDialog()
-        title = "Exporter un rapport"
-        path = self.settings.value("report_export_directory")
-        file_path = QFileDialog.getExistingDirectory(file_dialog, title, path)
+        mondays = list(report._mondays_of_count(count))
+        sections_ids = (
+            models.Section.objects.filter(lane__id_installation__count=count)
+            .distinct()
+            .values_list("id", flat=True)
+        )
+        report_selection_dialog = SelectSectionsToReport(
+            sections_ids=list(sections_ids), mondays=mondays
+        )
 
-        if not file_path:
+        if report_selection_dialog.exec_():
+            selected_sections_dates: dict[str, list[date]] = (
+                report_selection_dialog.get_inputs()
+            )
+            title = "Exporter un rapport"
+
+            path = self.settings.value("report_export_directory")
+            file_path = QFileDialog.getExistingDirectory(file_dialog, title, path)
+
+            if not file_path:
+                QgsMessageLog.logMessage(
+                    "{} - Generate report action ended: No file_path given".format(
+                        datetime.now()
+                    ),
+                    "Comptages",
+                    Qgis.Info,
+                )
+                return
             QgsMessageLog.logMessage(
-                "{} - Generate report action ended: No file_path given".format(
-                    datetime.now()
-                ),
+                f"""
+                {datetime.now()} - Generate report action can really begin now for count {count.id} with file_path: {file_path}.
+                Selected sections and dates: {selected_sections_dates}
+                """,
                 "Comptages",
                 Qgis.Info,
             )
-            return
-        QgsMessageLog.logMessage(
-            "{} - Generate report action can really begin now for count {} with file_path: {}".format(
-                datetime.now(), count.id, file_path
-            ),
-            "Comptages",
-            Qgis.Info,
-        )
 
-        self.tm.allTasksFinished.connect(partial(self.all_tasks_finished, "report"))
-        self.tm.addTask(
-            report_task.ReportTask(
-                file_path=file_path,
-                count=count,
+            self.tm.allTasksFinished.connect(partial(self.all_tasks_finished, "report"))
+            self.tm.addTask(
+                report_task.ReportTask(
+                    file_path=file_path,
+                    count=count,
+                    selected_sections_dates=selected_sections_dates,
+                )
             )
-        )
 
     def do_export_plan_action(self, count_id):
         count = models.Count.objects.get(id=count_id)
@@ -640,6 +676,12 @@ def do_delete_data_action(self, count_id):
                     qs = qs.filter(status=definitions.IMPORT_STATUS_DEFINITIVE)
 
                 qs.delete()
+                call_command("tjmreset")
+                QgsMessageLog.logMessage(
+                    "Les TJMs ont été réinitialisés; rouvrir cette fenêtre pour afficher les données actualisées!",
+                    "Comptages",
+                    Qgis.Info,
+                )
 
     def enable_actions_if_needed(self):
         """Enable actions if the plugin is connected to the db

comptages/core/importer.py

@@ -1,4 +1,4 @@
-from typing import Callable, Dict, Iterator, List, Optional
+from typing import Callable, Iterator, Optional
 import pytz
 import os
 from datetime import datetime, timedelta
@@ -9,8 +9,9 @@
 from comptages.core.bulk_create_manager import BulkCreateManager
 
 
-def simple_print_callback(progress):
-    print(f"Importing... {progress}%")
+def simple_print_callback(progress: int):
+    if progress % 10 == 0:
+        print(f"Importing... {progress}%")
 
 
 def import_file(file_path: str, count, callback_progress=simple_print_callback):
@@ -106,7 +107,7 @@ def _parse_and_write(
     bulk_mgr.done()
 
 
-def _parse_line_vbv1(line: str, **kwargs) -> Optional[List[Dict]]:
+def _parse_line_vbv1(line: str, **kwargs) -> Optional[list[dict]]:
     if line.startswith("* "):
         return None
 
@@ -155,7 +156,7 @@ def _parse_line_vbv1(line: str, **kwargs) -> Optional[List[Dict]]:
     return [parsed_line]
 
 
-def _parse_line_mc(line: str, **kwargs) -> Optional[List[Dict]]:
+def _parse_line_mc(line: str, **kwargs) -> Optional[list[dict]]:
     if not line.startswith("20"):
         return None
 
@@ -182,7 +183,7 @@ def _parse_line_mc(line: str, **kwargs) -> Optional[List[Dict]]:
         parsed_line["category"] = int(line[51:54].strip())
         parsed_line["height"] = ""
         parsed_line["times"] = 1
-    except ValueError as e:
+    except ValueError:
         # QgsMessageLog.logMessage(
         #     'ValueError: {}'.format(e),  'Comptages', Qgis.Info)
 
@@ -192,7 +193,7 @@ def _parse_line_mc(line: str, **kwargs) -> Optional[List[Dict]]:
     return [parsed_line]
 
 
-def _parse_line_int2(line, **kwargs) -> Iterator[Optional[Dict]]:
+def _parse_line_int2(line, **kwargs) -> Iterator[Optional[dict]]:
     if line.startswith("* "):
         return None