fix export end to handle several days

hytechimaging · Dec 8, 2023 · 1ceb79f · 1ceb79f
1 parent 5fb617d
commit 1ceb79f
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/gui/export.py b/src/gui/export.py
@@ -289,19 +289,19 @@ def environmentLayerJoinTransectInfo(self, layer: QgsVectorLayer) -> None:
 
     def addEndEffortFeature(self, layer: QgsVectorLayer) -> QgsVectorLayer:
         effortGroupValues = layer.uniqueValues(
-            layer.fields().indexOf("_effortGroup")
+            layer.fields().indexOf("effortGroup")
         )
         layer.startEditing()
         for effortGroupValue in effortGroupValues:
-            expr = QgsExpression(f"_effortGroup = {effortGroupValue}")
+            expr = QgsExpression(f"effortGroup = '{effortGroupValue}'")
             request = QgsFeatureRequest(expr).addOrderBy("dateTime", False)
             lastEffortFt = None
             for lastEffortFt in layer.getFeatures(request):
                 break
             if not lastEffortFt:
                 continue
             expr = QgsExpression(
-                f"_effortGroup != {effortGroupValue} and "
+                f"effortGroup != '{effortGroupValue}' and "
                 f"status = '{StatusCode.display(StatusCode.BEGIN)}' and "
                 "dateTime > "
                 f"'{lastEffortFt['dateTime'].toPyDateTime().isoformat()}'"
@@ -310,7 +310,10 @@ def addEndEffortFeature(self, layer: QgsVectorLayer) -> QgsVectorLayer:
             nextBegFt = None
             for nextBegFt in layer.getFeatures(request):
                 break
-            if not nextBegFt:
+            if not nextBegFt or (
+                QDateTime(lastEffortFt["dateTime"]).date()
+                != QDateTime(nextBegFt["dateTime"]).date()
+            ):
                 nextBegFt = lastEffortFt
                 dt = QDateTime(nextBegFt["dateTime"]).addSecs(1)
             else: