Merge pull request #1 from sitn/pgrellet2024gl4

merge GL4

.github/workflows/ci.yml

@@ -28,6 +28,8 @@ jobs:
       - name: Package
         run: qgis-plugin-ci --no-validation package 'test'
       - name: Lint
+        run: black . --diff --color
+      - name: Lint check
         run: black . --check
       - name: Check
         run: pyright . > pyright_report.txt

comptages/comptages.py

@@ -250,15 +250,7 @@ def import_file(self, file_path, count_id=None):
             return
 
         QgsMessageLog.logMessage(
-            "{} - Prepare import file {}".format(
-                datetime.now(), os.path.basename(file_path)
-            ),
-            "Comptages",
-            Qgis.Info,
-        )
-
-        QgsMessageLog.logMessage(
-            "{} - Import file {} started".format(
+            "{} - Prepare import file {} ended".format(
                 datetime.now(), os.path.basename(file_path)
             ),
             "Comptages",
@@ -369,14 +361,16 @@ def do_filter_action(self):
 
     def do_yearly_report_action(self):
         QgsMessageLog.logMessage(
-            "{} - Generate yearly report action started".format(datetime.now()),
+            "{} - Generate task for yearly report action started".format(
+                datetime.now()
+            ),
             "Comptages",
             Qgis.Info,
         )
 
         if self.tm.countActiveTasks() > 0:
             push_info(
-                ("Veuillez patienter jusqu'à ce que l'importation " "soit terminée.")
+                ("Veuillez patienter jusqu'à ce que l'importation soit terminée.")
             )
             return
 
@@ -394,11 +388,15 @@ def do_yearly_report_action(self):
 
         section_id = selected_feature.attribute("id")
         section = models.Section.objects.get(id=section_id)
-
         classes = self.layers.get_classes_of_section(section_id)
+        years = self.layers.get_years_of_counts_on_section(section_id)
+
         dlg = YearlyReportDialog(self.iface)
         dlg.section.insert(section_id)
         dlg.classi.addItems(classes)
+        if years is not None:
+            years.sort()
+            dlg.year.setValue(years[-1])
 
         if dlg.exec_():
             year = dlg.year.value()
@@ -411,15 +409,15 @@ def do_yearly_report_action(self):
 
             if not file_path:
                 QgsMessageLog.logMessage(
-                    "{} - Generate yearly report action ended: No file_path given".format(
+                    "{} - Generate task for yearly report action cancelled: No file_path given".format(
                         datetime.now()
                     ),
                     "Comptages",
                     Qgis.Info,
                 )
                 return
             QgsMessageLog.logMessage(
-                "{} - Generate yearly report action can really begin now for count {} with file_path: {}".format(
+                "{} - Generate task for yearly report action can really begin now for count {} with file_path: {}".format(
                     datetime.now(), selected_count, file_path
                 ),
                 "Comptages",
@@ -435,7 +433,7 @@ def do_yearly_report_action(self):
                 return
 
             if clazz.startswith("SPCH-MD"):
-                yrb = YearlyReportBike(file_path, year, section_id)
+                yrb = YearlyReportBike(file_path, year, section_id, clazz)
                 yrb.run()
             else:
                 self.tm.allTasksFinished.connect(
@@ -454,7 +452,7 @@ 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()),
+            "{} - Generate task for yearly report action ended".format(datetime.now()),
             "Comptages",
             Qgis.Info,
         )
@@ -505,7 +503,9 @@ def do_import_single_file_action(self, count_id):
 
     def do_generate_report_action(self, count_id):
         QgsMessageLog.logMessage(
-            "{} - Generate report action started".format(datetime.now()),
+            "{} - Generate report preparation started for count_id {}".format(
+                datetime.now(), count_id
+            ),
             "Comptages",
             Qgis.Info,
         )
@@ -514,7 +514,10 @@ def do_generate_report_action(self, count_id):
 
         if self.tm.countActiveTasks() > 0:
             push_info(
-                ("Veuillez patienter jusqu'à ce que l'importation " "soit terminée.")
+                (
+                    "Veuillez patienter jusqu'à ce que l'importation soit terminée,"
+                    " puis relancer la génération du rapport."
+                )
             )
             return
 
@@ -525,7 +528,7 @@ def do_generate_report_action(self, count_id):
                 "le comptage {}".format(count.id_installation.name, count.id)
             )
             QgsMessageLog.logMessage(
-                "{} - Generate report action ended: No data for count {}".format(
+                "{} - Generate report preparation ended: No data for count {}".format(
                     datetime.now(), count.id
                 ),
                 "Comptages",
@@ -534,39 +537,50 @@ def do_generate_report_action(self, count_id):
             return
 
         file_dialog = QFileDialog()
-        mondays = list(report._mondays_of_count(count))
+        mondays = 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
+            sections_ids=list(sections_ids), mondays=list(mondays)
         )
 
         if report_selection_dialog.exec_():
             selected_sections_dates: dict[str, list[date]] = (
                 report_selection_dialog.get_inputs()
             )
-            title = "Exporter un rapport"
+            date_choosen = list()
+            for selsec in selected_sections_dates:
+                date_choosen.extend(selected_sections_dates[selsec])
+            if len(date_choosen) == 0:
+                QgsMessageLog.logMessage(
+                    "{} - Generate report preparation ended: Nothing choosen to report on".format(
+                        datetime.now()
+                    ),
+                    "Comptages",
+                    Qgis.Info,
+                )
+                return
 
+            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(
+                    "{} - Generate report preparation ended: No file_path given".format(
                         datetime.now()
                     ),
                     "Comptages",
                     Qgis.Info,
                 )
                 return
+
             QgsMessageLog.logMessage(
-                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}
-                """,
+                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,
             )
@@ -579,6 +593,23 @@ def do_generate_report_action(self, count_id):
                     selected_sections_dates=selected_sections_dates,
                 )
             )
+        else:
+            QgsMessageLog.logMessage(
+                "{} - Generate report preparation ended: Cancel buton clicked...".format(
+                    datetime.now()
+                ),
+                "Comptages",
+                Qgis.Info,
+            )
+            return
+
+        QgsMessageLog.logMessage(
+            "{} - Generate report preparation ended for count_id {}".format(
+                datetime.now(), count_id
+            ),
+            "Comptages",
+            Qgis.Info,
+        )
 
     def do_export_plan_action(self, count_id):
         count = models.Count.objects.get(id=count_id)

comptages/core/importer.py

@@ -1,13 +1,15 @@
 from typing import Callable, Iterator, Optional
-import pytz
-import os
+from pytz import timezone
+from os import path
 from datetime import datetime, timedelta
 from django.db.models import Q
 
 from comptages.core import definitions
 from comptages.datamodel import models
 from comptages.core.bulk_create_manager import BulkCreateManager
 
+TZ = timezone("Europe/Zurich")
+
 
 def simple_print_callback(progress: int):
     if progress % 10 == 0:
@@ -51,7 +53,7 @@ def _parse_and_write(
     from_aggregate: bool = False,
     **kwargs,
 ):
-    basename = os.path.basename(file_path)
+    basename = path.basename(file_path)
     bulk_mgr = BulkCreateManager(chunk_size=1000)
     lanes = _populate_lane_dict(count)
     directions = _populate_direction_dict(count)
@@ -112,10 +114,9 @@ def _parse_line_vbv1(line: str, **kwargs) -> Optional[list[dict]]:
         return None
 
     parsed_line = {}
-    tz = pytz.timezone("Europe/Zurich")
     try:
         parsed_line["numbering"] = line[0:6]
-        parsed_line["timestamp"] = tz.localize(
+        parsed_line["timestamp"] = TZ.localize(
             datetime.strptime("{}0000".format(line[7:24]), "%d%m%y %H%M %S %f")
         )
         parsed_line["reserve_code"] = line[25:31]
@@ -162,11 +163,10 @@ def _parse_line_mc(line: str, **kwargs) -> Optional[list[dict]]:
 
     parsed_line = {}
     try:
-        tz = pytz.timezone("Europe/Zurich")
         # TODO: numbering
         numbering = 1
         parsed_line["numbering"] = numbering
-        parsed_line["timestamp"] = tz.localize(
+        parsed_line["timestamp"] = TZ.localize(
             datetime.strptime(line[0:19], "%Y-%m-%d %H:%M:%S")
         )
         # On MetroCount files, the direction is 0-1 instead of 1-2
@@ -198,18 +198,17 @@ def _parse_line_int2(line, **kwargs) -> Iterator[Optional[dict]]:
         return None
 
     parsed_line = {}
-    tz = pytz.timezone("Europe/Zurich")
     # TODO: numbering
     numbering = 1
     parsed_line["numbering"] = numbering
     # In the data files midnight is 2400 of the current day
     # instead of 0000 of the next day
     if line[7:9] == "24":
         line = line[:7] + "00" + line[9:]
-        end = tz.localize(datetime.strptime("{}".format(line[0:11]), "%d%m%y %H%M"))
+        end = TZ.localize(datetime.strptime("{}".format(line[0:11]), "%d%m%y %H%M"))
         end += timedelta(days=1)
     else:
-        end = tz.localize(datetime.strptime("{}".format(line[0:11]), "%d%m%y %H%M"))
+        end = TZ.localize(datetime.strptime("{}".format(line[0:11]), "%d%m%y %H%M"))
 
     parsed_line["end"] = end
     parsed_line["start"] = parsed_line["end"] - timedelta(minutes=kwargs["interval"])
@@ -294,7 +293,6 @@ def _get_int_bins(
 
 def _parse_file_header(file_path: str):
     file_header = dict()
-    tz = pytz.timezone("Europe/Zurich")
 
     with open(file_path, encoding=get_file_encoding(file_path)) as f:
         for line in f:
@@ -308,12 +306,12 @@ def _parse_file_header(file_path: str):
                     if key == "CLASS" and value == "SPECIAL10":
                         value = "SWISS10"
                     if key in ["STARTREC", "STOPREC"]:
-                        value = tz.localize(datetime.strptime(value, "%H:%M %d/%m/%y"))
+                        value = TZ.localize(datetime.strptime(value, "%H:%M %d/%m/%y"))
                     file_header[key] = value
             # MetroCount
             elif line.startswith("MetroCount"):
                 file_header["FORMAT"] = "MC"
-            elif line.startswith("Place"):
+            elif line.startswith("Place") and "SITE" not in file_header:
                 file_header["SITE"] = line[line.find("[") + 1 : line.find("]")].replace(
                     "-", ""
                 )
@@ -322,11 +320,11 @@ def _parse_file_header(file_path: str):
                 and file_header["FORMAT"] == "MC"
                 and "STARTREC" not in file_header
             ):
-                file_header["STARTREC"] = tz.localize(
+                file_header["STARTREC"] = TZ.localize(
                     datetime.strptime(line[:19], "%Y-%m-%d %H:%M:%S")
                 )
             elif line.startswith("20") and file_header["FORMAT"] == "MC":
-                file_header["STOPREC"] = tz.localize(
+                file_header["STOPREC"] = TZ.localize(
                     datetime.strptime(line[:19], "%Y-%m-%d %H:%M:%S")
                 )
             elif line.startswith("Type de Cat") and file_header["FORMAT"] == "MC":
@@ -337,8 +335,12 @@ def _parse_file_header(file_path: str):
                     file_header["CLASS"] = "NZ13"
                 elif file_header["CLASS"][:5] == "FHWA ":
                     file_header["CLASS"] = "FHWA13"
-                elif file_header["CLASS"] == "CAT-Cycle_dist-empat":
-                    file_header["CLASS"] = "SPCH-MD 5C"
+                elif file_header["CLASS"] in (
+                    "CAT-Cycle_dist-empat",
+                    "SPCH-MD5C",
+                    "SPCH-MD 5C",
+                ):
+                    file_header["CLASS"] = "SPCH-MD_5C"
 
     return file_header
 

comptages/core/importer_task.py

@@ -30,14 +30,16 @@ def run(self):
     def finished(self, result: Any):
         if result:
             QgsMessageLog.logMessage(
-                "{} - Import file {} ended".format(datetime.now(), self.basename),
+                "{} - Task import for file {} created".format(
+                    datetime.now(), self.basename
+                ),
                 "Comptages",
                 Qgis.Info,
             )
 
         else:
             QgsMessageLog.logMessage(
-                "{} - Import file {} ended with errors: {}".format(
+                "{} - Task import creation for file {} ended with errors: {}".format(
                     datetime.now(), self.basename, self.exception
                 ),
                 "Comptages",

comptages/core/layers.py

@@ -450,7 +450,7 @@ def get_counts_of_section_by_year(self, section_id, year):
         except StopIteration:
             return []
 
-        print(counts)
+        print(f"get_counts_of_section_by_year - counts:{counts}")
         return counts
 
     def get_lanes_of_section(self, section_id):
@@ -982,6 +982,15 @@ def get_classes_of_section(self, section_id: str):
 
         return result
 
+    def get_years_of_counts_on_section(self, section_id: str):
+        result = list()
+        counts = self.get_counts_of_section(section_id)
+
+        for count in counts:
+            result.append((count.attribute("end_process_date")).year())
+
+        return result
+
     def check_sensor_of_lane(self, lane_id: str):
         """Check id a lane is registered in the sensor table"""