Merge pull request #598 from wri/release/tacky-teak-hotfix-2024-12-03

[RELEASE] Tacky Teak Hotfix 2024 12 03
wri · Dec 4, 2024 · 0346e4d · 0346e4d
2 parents 7e29a10 + fa239e4
commit 0346e4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/Http/Resources/V2/ProjectReports/ProjectReportResource.php b/app/Http/Resources/V2/ProjectReports/ProjectReportResource.php
@@ -118,8 +118,8 @@ public function toArray($request)
             'people_knowledge_skills_increased' => $this->people_knowledge_skills_increased,
             'indirect_beneficiaries' => $this->indirect_beneficiaries,
             'indirect_beneficiaries_description' => $this->indirect_beneficiaries_description,
-            'workdays_direct_total' => $this->workdays_direct,
-            'workdays_convergence_total' => $this->workdays_convergence,
+            'workdays_direct_total' => $this->workdays_direct_total,
+            'workdays_convergence_total' => $this->workdays_convergence_total,
             'non_tree_total' => $this->non_tree_total,
             'total_community_partners' => $this->total_community_partners,
         ];

diff --git a/app/Models/Traits/HasWorkdays.php b/app/Models/Traits/HasWorkdays.php
@@ -42,12 +42,12 @@ public function getWorkdaysVolunteerAttribute(): int
         return $this->sumTotalWorkdaysAmounts(self::WORKDAY_COLLECTIONS['volunteer']);
     }
 
-    public function getWorkdaysDirectAttribute(): int
+    public function getWorkdaysDirectTotalAttribute(): int
     {
         return $this->sumTotalWorkdaysAmounts(self::WORKDAY_COLLECTIONS['direct']);
     }
 
-    public function getWorkdaysConvergenceAttribute(): int
+    public function getWorkdaysConvergenceTotalAttribute(): int
     {
         return $this->sumTotalWorkdaysAmounts(self::WORKDAY_COLLECTIONS['convergence']);
     }