|
84 | 84 | indicator_action_passive: indicator.action_passive, |
85 | 85 | indicator_denominator: indicator_denominator(indicator), |
86 | 86 | 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), |
88 | 89 | indicator_unit: indicator.unit, |
89 | 90 | target_type: indicator.target_type, |
90 | 91 | target_ui: indicator.target_type_frontend, |
|
112 | 113 | <p class="missing-input-warning d-none">Enter a goal value</p> |
113 | 114 | </div> |
114 | 115 | <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> |
116 | 117 | <button class="next-button">Next</button> |
117 | 118 | </div> |
118 | 119 | <div class="inactive d-none"> |
|
133 | 134 | <p class="missing-input-warning d-none">Enter a goal value</p> |
134 | 135 | </div> |
135 | 136 | <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> |
137 | 138 | <button class="next-button">Next</button> |
138 | 139 | </div> |
139 | 140 | <div class="inactive d-none"> |
|
252 | 253 | $('.indicator-action').text(indicator.action) |
253 | 254 | $('.indicator-denominator').text(indicator.denominator) |
254 | 255 | $('.indicator-previous-numerator').text(indicator.previous_numerator) |
| 256 | + $('.indicator-previous-denominator').text(indicator.previous_denominator) |
255 | 257 | $('.active-action').text(indicator.active_action) |
256 | 258 | $('.passive-action').text(indicator.passive_action) |
257 | 259 | $('.indicator-unit').text(indicator.unit) |
|
359 | 361 | { |
360 | 362 | 'denominator': $(e.currentTarget).data('indicator-denominator'), |
361 | 363 | 'previous_numerator': $(e.currentTarget).data('indicator-previous-numerator'), |
| 364 | + 'previous_denominator': $(e.currentTarget).data('indicator-previous-denominator'), |
362 | 365 | 'action': $(e.currentTarget).data('indicator-action'), |
363 | 366 | 'passive_action': $(e.currentTarget).data('indicator-action-passive'), |
364 | 367 | 'active_action': $(e.currentTarget).data('indicator-action-active'), |
|
0 commit comments