Add camapignID to getUserProgress function

PTFS-Europe · Nov 11, 2024 · f234d4b · f234d4b
1 parent c944aef
commit f234d4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/web/services/MyAccount/MyCampaigns.php b/code/web/services/MyAccount/MyCampaigns.php
@@ -85,7 +85,7 @@ function getCampaigns() {
 
                     //Calculate milestone progress
                     $milestoneProgress = CampaignMilestone::getMilestoneProgress($campaignId, $userId, $milestone->id);
-                    $progressData = CampaignMilestoneProgressEntry::getUserProgressDataByMilestoneId($userId, $milestoneId);
+                    $progressData = CampaignMilestoneProgressEntry::getUserProgressDataByMilestoneId($userId, $milestoneId, $campaignId);
 
                     $milestone->progress = $milestoneProgress['progress'];
                     $milestone->completedGoals = $milestoneProgress['completed'];

diff --git a/code/web/sys/Community/CampaignMilestoneProgressEntry.php b/code/web/sys/Community/CampaignMilestoneProgressEntry.php
@@ -42,10 +42,12 @@ public function initialize(CampaignMilestone $campaignMilestone, $args = null)
         $this->insert();
     }
 
-    public static function getUserProgressDataByMilestoneId($userId, $milestoneId) {
+    public static function getUserProgressDataByMilestoneId($userId, $milestoneId, $campaignId) {
         $campaignMilestoneProgressEntry = new self();
         $campaignMilestoneProgressEntry->whereAdd("userId = " . $userId);
         $campaignMilestoneProgressEntry->whereAdd("ce_milestone_id = " . $milestoneId);
+        $campaignMilestoneProgressEntry->whereAdd("ce_campaign_id = " . $campaignId);
+
 
         $results = [];
         if ($campaignMilestoneProgressEntry->find()) {