fix: adapting the graph to the new criteria

TallerWebSolutions · Oct 31, 2023 · ab1afb6 · ab1afb6
1 parent fb09ac9
commit ab1afb6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/graphql/types/teams/membership_type.rb b/app/graphql/types/teams/membership_type.rb
@@ -23,11 +23,13 @@ def member_role_description
       end
 
       def team_members_hourly_rate_list 
-        tmhrl = []
-        (1..13).reverse_each do |date|
-          tmhrl << {'value_per_hour_performed' => (calculate_hours_per_month(object.monthly_payment, object.effort_in_period(Date.today.ago(date.month).beginning_of_month, Date.today.ago(date.month).end_of_month))), 'period_date' => Date.today.ago(date.month).beginning_of_month  }
+        if object.monthly_payment != 0 && object.team_member.billable? 
+          tmhrl = []
+          (1..7).reverse_each do |date|
+            tmhrl << {'value_per_hour_performed' => (calculate_hours_per_month(object.monthly_payment, object.effort_in_period(Date.today.ago(date.month).beginning_of_month, Date.today.ago(date.month).end_of_month))), 'period_date' => Date.today.ago(date.month).end_of_month  }
+          end
+          tmhrl
         end
-        tmhrl
       end
 
       def calculate_hours_per_month(sallary, month_hours)

diff --git a/app/spa/src/locales/en/teams.json b/app/spa/src/locales/en/teams.json
@@ -76,7 +76,7 @@
     "leadTimeP80YLabel": "Days",
     "financialPerformance": "Financial Performance",
     "financialPerformanceYLabel": "Amount",
-    "hoursPerPeriodMemberships": "Memberships Hours"
+    "hoursPerPeriodMemberships": "Value per Hour of Work"
   },
   "actions": {
     "edit": "Edit Team",

diff --git a/app/spa/src/locales/pt/teams.json b/app/spa/src/locales/pt/teams.json
@@ -76,7 +76,7 @@
     "leadTimeP80YLabel": "Days",
     "financialPerformance": "Financial Performance",
     "financialPerformanceYLabel": "Amount",
-    "hoursPerPeriodMemberships": "Memberships Hours"
+    "hoursPerPeriodMemberships": "Value per Hour of Work"
   },
   "actions": {
     "edit": "Editar Time",

diff --git a/spec/graphql/types/query_type_spec.rb b/spec/graphql/types/query_type_spec.rb
@@ -357,10 +357,8 @@
                                                        'teamConsolidationsWeekly' => [],
                                                        'teamMonthlyInvestment' => { 'xAxis' => ['2022-09-30'], 'yAxis' => [-4500.0] },
                                                        'teamMemberEfficiency' => { 'membersEfficiency' => [{ 'effortInMonth' => 0.0, 'membership' => { 'teamMemberName' => 'aaa' }, 'realizedMoneyInMonth' => 0.0 }, { 'effortInMonth' => 0.0, 'membership' => { 'teamMemberName' => 'ddd' }, 'realizedMoneyInMonth' => 0.0 }] },
-                                                       'memberships' => [{ 'id' => other_membership.id.to_s, 'memberRoleDescription' => 'Cliente', 'teamMembersHourlyRateList' => [{"periodDate"=>"2021-08-01","valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2021-09-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2021-10-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2021-11-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2021-12-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-01-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-02-01", "valuePerHourPerformed"=>2000.0}, 
-                                                        {"periodDate"=>"2022-03-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-04-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-05-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-06-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-07-01", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-08-01", "valuePerHourPerformed"=>2000.0}] }, 
-                                                        { 'id' => membership.id.to_s, 'memberRoleDescription' => 'Desenvolvedor', "teamMembersHourlyRateList"=> [{"periodDate"=>"2021-08-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2021-09-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2021-10-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2021-11-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2021-12-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-01-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-02-01", "valuePerHourPerformed"=>0.0}, 
-                                                        {"periodDate"=>"2022-03-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-04-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-05-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-06-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-07-01", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-08-01", "valuePerHourPerformed"=>0.0}] }],
+                                                       'memberships' => [{ 'id' => other_membership.id.to_s, 'memberRoleDescription' => 'Cliente', "teamMembersHourlyRateList"=>[{"periodDate"=>"2022-02-28", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-03-31", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-04-30", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-05-31", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-06-30", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-07-31", "valuePerHourPerformed"=>2000.0}, {"periodDate"=>"2022-08-31", "valuePerHourPerformed"=>2000.0}] }, 
+                                                        { 'id' => membership.id.to_s, 'memberRoleDescription' => 'Desenvolvedor', "teamMembersHourlyRateList"=>[{"periodDate"=>"2022-02-28", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-03-31", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-04-30", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-05-31", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-06-30", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-07-31", "valuePerHourPerformed"=>0.0}, {"periodDate"=>"2022-08-31", "valuePerHourPerformed"=>0.0}]}],
                                                        'lastReplenishingConsolidations' => [
                                                          {
                                                            'id' => replenishing_consolidation.id.to_s,