Changeset 38

Timestamp:

Sep 10, 2020, 10:45:41 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Changed runner teams was updated with incorrect team id.

File:

• trunk/index.php (modified) (3 diffs)

trunk/index.php

@@ -203 +203 @@
                 'IsFamily' => 0,
               ));
-              $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1, 'Team' => $Item['TeamId']);
+              $Teams[$Item['TeamId']] = array('Id' => $TeamId, 'Distance' => -1);
               $NextTeamId++;
             } else
@@ -222 +222 @@
             'Year' => $Year,
           ));
-          $Runners[$Item['ChipNumber']] = array('Id' => $RunnerId, 'Distance' => -1);
+          $Runners[$Item['ChipNumber']] = array('Id' => $RunnerId, 'Distance' => -1, 'Team' => $TeamId);
           $NextRunnerId++;
         } else {
@@ -228 +228 @@
 
           // Update runner team if it was changed
-          if ($Item['TeamId'] != $Runners[$Item['ChipNumber']]['Team'] and array_key_exists($Item['TeamId'], $Teams))
+          $OldRunnerTeamId = $Runners[$Item['ChipNumber']]['Team'];
+          if ($Item['TeamId'] == null)
           {
-            $Runners[$Item['ChipNumber']]['Team'] = $Item['TeamId'];
-            $Queries[] = $this->Database->GetUpdate('Runner', 'Id='.$RunnerId, array('Team' => $Item['TeamId']));
+            $NewRunnerTeamId = null;
+          } else
+          {
+            $NewRunnerTeamId = $Teams[$Item['TeamId']]['Id'];
+          }
+          if ($OldRunnerTeamId != $NewRunnerTeamId)
+          {
+            $Runners[$Item['ChipNumber']]['Team'] = $NewRunnerTeamId;
+            $Queries[] = $this->Database->GetUpdate('Runner', 'Id='.$RunnerId, array('Team' => $NewRunnerTeamId));
           }
         }