P1 (all in 1)

.github/workflows/ci.yml

@@ -33,7 +33,7 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-22.04
-    timeout-minutes: 15
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - name: Start docker stack
@@ -44,4 +44,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: coverage_report.txt
-          path: testoutputs/coverage_report.txt
+          path: test_outputs/coverage_report.txt

.gitignore

@@ -7,5 +7,11 @@
 .docker/tests/
 .docker/tests/screenshot.png
 .env
+.vscode/
+shell.nix
+Pipfile
+/test_outputs
+*.nix
+*.log
 .idea
-.coverage
+.coverage

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,6 +30,7 @@
 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
 
 
@@ -389,6 +391,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,6 +424,14 @@ 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()
@@ -515,34 +526,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)