Skip to content

Commit ca9bb65

Browse files
authored
fix(Dr. Rai Reports): Use previous denominator for setting goals (#5674)
**Story card:** [sc-16602](https://app.shortcut.com/simpledotorg/story/16602/fix-the-of-number) ## Because The numbers were wrong. Visibly wrong in production which had much more data. ## This addresses We adhere to the constraint that the goals of the current cuarter are being set in relation to the numbers of the previous quarter. ## Test instructions n/a
1 parent 1f414c3 commit ca9bb65

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

app/components/dashboard/dr_rai_report.html.erb

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
indicator_action_passive: indicator.action_passive,
8585
indicator_denominator: indicator_denominator(indicator),
8686
indicator_id: indicator.id,
87-
indicator_previous_numerator: indicator_previous_numerator(indicator),
87+
indicator_previous_numerator: indicator_numerator(indicator, selected_period.previous),
88+
indicator_previous_denominator: indicator_denominator(indicator, selected_period.previous),
8889
indicator_unit: indicator.unit,
8990
target_type: indicator.target_type,
9091
target_ui: indicator.target_type_frontend,
@@ -112,7 +113,7 @@
112113
<p class="missing-input-warning d-none">Enter a goal value</p>
113114
</div>
114115
<p class="activity-promise"><span class="active-action"></span> <span class="highlight target-number">0</span> <span class="indicator-unit"></span> by <%= end_of(selected_period) %></p>
115-
<p class="activity-statement"><span class="highlight"><span class="previous-percentage">6</span>%</span> <span class='indicator-action'></span> (<span class='indicator-previous-numerator'></span> of <span class='indicator-denominator'></span>) in <%= human_readable(selected_period.previous) %></p>
116+
<p class="activity-statement"><span class="highlight"><span class="previous-percentage">6</span>%</span> <span class='indicator-action'></span> (<span class='indicator-previous-numerator'></span> of <span class='indicator-previous-denominator'></span>) in <%= human_readable(selected_period.previous) %></p>
116117
<button class="next-button">Next</button>
117118
</div>
118119
<div class="inactive d-none">
@@ -133,7 +134,7 @@
133134
<p class="missing-input-warning d-none">Enter a goal value</p>
134135
</div>
135136
<p class="activity-promise"><span class="active-action"></span> <span class="highlight target-number">0</span> <span class="indicator-unit"></span> by <%= end_of(selected_period) %></p>
136-
<p class="activity-statement"><span class="highlight"><span class="indicator-previous-numerator">6</span></span> <span class='indicator-action'></span> (<span class='indicator-previous-numerator'></span> of <span class='indicator-denominator'></span>) in <%= human_readable(selected_period.previous) %></p>
137+
<p class="activity-statement"><span class="highlight"><span class="indicator-previous-numerator">6</span></span> <span class='indicator-action'></span> (<span class='indicator-previous-numerator'></span> of <span class='indicator-previous-denominator'></span>) in <%= human_readable(selected_period.previous) %></p>
137138
<button class="next-button">Next</button>
138139
</div>
139140
<div class="inactive d-none">
@@ -252,6 +253,7 @@
252253
$('.indicator-action').text(indicator.action)
253254
$('.indicator-denominator').text(indicator.denominator)
254255
$('.indicator-previous-numerator').text(indicator.previous_numerator)
256+
$('.indicator-previous-denominator').text(indicator.previous_denominator)
255257
$('.active-action').text(indicator.active_action)
256258
$('.passive-action').text(indicator.passive_action)
257259
$('.indicator-unit').text(indicator.unit)
@@ -359,6 +361,7 @@
359361
{
360362
'denominator': $(e.currentTarget).data('indicator-denominator'),
361363
'previous_numerator': $(e.currentTarget).data('indicator-previous-numerator'),
364+
'previous_denominator': $(e.currentTarget).data('indicator-previous-denominator'),
362365
'action': $(e.currentTarget).data('indicator-action'),
363366
'passive_action': $(e.currentTarget).data('indicator-action-passive'),
364367
'active_action': $(e.currentTarget).data('indicator-action-active'),

app/components/dashboard/dr_rai_report.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ def custom_indicators
3939
.filter { |indicator| indicator.is_supported?(region) }
4040
end
4141

42-
def indicator_previous_numerator(indicator)
43-
indicator.numerator(region, selected_period.previous)
42+
def indicator_numerator(indicator, period = selected_period)
43+
indicator.numerator(region, period)
4444
end
4545

46-
def indicator_denominator(indicator)
47-
indicator.denominator(region, selected_period)
46+
def indicator_denominator(indicator, period = selected_period)
47+
indicator.denominator(region, period)
4848
end
4949

5050
def current_period

0 commit comments

Comments
 (0)