[chronojump] Import session also imports forceSensor triggers

[Xavier de Blas <xaviblas src gnome org>]

commit 02adc14e790e0f97c16ea552b86babc7d000bbeb
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Apr 27 19:14:07 2021 +0200

    Import session also imports forceSensor triggers

 howto_new_version.txt                          |  1 +
 src/chronojump-importer/chronojump_importer.py | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/howto_new_version.txt b/howto_new_version.txt
index f38ccd74..2c0f260c 100644
--- a/howto_new_version.txt
+++ b/howto_new_version.txt
@@ -139,6 +139,7 @@ windows stuff
 ------------
 
 1) if chronojump_importer.py has changed, need to manually create the importer for python3
+It changed on: 27 Apr 2021!!
 because windows compile machine has cerbero with python2 and we do not want to break stuff installing python3
 
 on my local laptop:
diff --git a/src/chronojump-importer/chronojump_importer.py b/src/chronojump-importer/chronojump_importer.py
index a5aea530..a048ef6a 100755
--- a/src/chronojump-importer/chronojump_importer.py
+++ b/src/chronojump-importer/chronojump_importer.py
@@ -34,7 +34,7 @@ debugFile = ""
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Copyright (C) 2016-2017 Carles Pina i Estany <carles pina cat>
- * Copyright (C) 2019-2020 Xavier de Blas <xaviblas gmail com>
+ * Copyright (C) 2019-2021 Xavier de Blas <xaviblas gmail com>
  */
 """
 
@@ -429,9 +429,10 @@ class ImportSession:
         self._import_runs()
         self._import_pulse()
         trigger = self._import_encoder()
-        self._import_forceSensor()
+        triggerForceSensor = self._import_forceSensor()
         triggerRunEncoder = self._import_runEncoder()
 
+        trigger.concatenate_table(triggerForceSensor)
         trigger.concatenate_table(triggerRunEncoder)
         trigger.remove_duplicates()
         self.destination_db.write(table=trigger, matches_columns=None)
@@ -722,13 +723,24 @@ class ImportSession:
         self.destination_db.write(table=forceSensor,
                                   matches_columns=self.destination_db.column_names("forceSensor", 
skip_columns=["uniqueID", "personID", "exerciseID"]))
 
+        # Imports trigger (can be encoder, forceSensor or raceanalyzer).
+        trigger = self.source_db.read(table_name="trigger",
+                where_condition="mode='FORCESENSOR' AND 
ForceSensor.sessionID={}".format(self.source_session),
+                join_clause="LEFT JOIN ForceSensor ON ForceSensor.uniqueID=trigger.modeID")
+
+        trigger.update_ids("modeID", forceSensor, "uniqueID", "new_uniqueID")
+
         if(DEBUGTOFILE):
             debugFile.write(" end _import_forceSensor\n")
 
+        return trigger
+
+
+
     def _import_runEncoder(self):
         self._print_status(self, "runEncoder")
         # Imports RunEncoderExercise
-        # VERY similar to _import_runEncoder
+        # VERY similar to _import_forceSensor
 
         if(DEBUGTOFILE):
             debugFile.write(" start _import_runEncoder\n")
@@ -756,18 +768,20 @@ class ImportSession:
         self.destination_db.write(table=runEncoder,
                                   matches_columns=self.destination_db.column_names("runEncoder", 
skip_columns=["uniqueID", "personID", "exerciseID"]))
 
-        # Imports trigger (can be encoder, forceSensor or raceanalyzer. Right now force sensor is not 
programmed)
+        # Imports trigger (can be encoder, forceSensor or raceanalyzer).
         trigger = self.source_db.read(table_name="trigger",
                 where_condition="mode='RACEANALYZER' AND 
RunEncoder.sessionID={}".format(self.source_session),
                 join_clause="LEFT JOIN RunEncoder ON RunEncoder.uniqueID=trigger.modeID")
 
         trigger.update_ids("modeID", runEncoder, "uniqueID", "new_uniqueID")
-        return trigger
-
 
         if(DEBUGTOFILE):
             debugFile.write(" end _import_runEncoder\n")
 
+        return trigger
+
+
+
 
 
     @staticmethod