feat(#10318): display previous month's targets when selected

api/resources/translations/messages-en.properties

@@ -1248,8 +1248,8 @@ targets.births.title = Births
 targets.count.default = ({{pass}} of {{total}})
 targets.disabled = Targets are disabled for your user account.
 targets.no_targets = No target found.
-targets.this_month.subtitle = This month
-targets.last_month.subtitle = Last month
+targets.this_month.subtitle = Current month
+targets.last_month.subtitle = Previous month
 task.date = Due date
 task.days.left = {DAYS, plural, one{1 day left} other{\# days left}}
 task.list.complete = No more tasks

webapp/src/ts/modules/analytics/analytics-targets.component.html

@@ -48,7 +48,20 @@
             <h2 *ngIf="target.translation_key">{{ target.translation_key | translate }}</h2>
             <h2 *ngIf="!target.translation_key">{{ target.name | translateFrom }}</h2>
             <p *ngIf="target.subtitle_translation_key">
-              {{ target.subtitle_translation_key | translate }}
+
+              <!-- 🔹 Show “Current month” when current filter is selected -->
+  <ng-container *ngIf="reportingPeriodFilter === 'current'; else previousSubtitle">
+    {{ 'targets.this_month.subtitle' | translate }}
+  </ng-container>
+
+  <!-- 🔹 Show “All time” when previous month is selected -->
+  <ng-template #previousSubtitle>
+    {{ 'targets.all_time.subtitle' | translate }}
+    <!-- Inline note: only show when previous period -->
+
+  </ng-template>
+
+
             </p>
           </div>
         </div>

webapp/src/ts/modules/analytics/analytics-targets.component.ts

@@ -93,7 +93,7 @@ export class AnalyticsTargetsComponent implements OnInit, OnDestroy {
       .isEnabled()
       .then(isEnabled => {
         this.targetsDisabled = !isEnabled;
-        return isEnabled ? this.rulesEngineService.fetchTargets() : [];
+        return isEnabled ? this.rulesEngineService.fetchTargets(this.reportingPeriodFilter) : [];
       })
       .catch(err => {
         console.error('Error getting targets', err);

webapp/src/ts/services/calendar-interval.service.ts

@@ -23,4 +23,16 @@ export class CalendarIntervalService {
   getInterval(startDate:number, timestamp:number) {
     return CalendarInterval.getInterval(startDate, timestamp);
   }
+
+  /**
+   * Returns the previous reporting period interval based on the start day.
+   * This is used when the sidebar filter selects "previous month".
+   */
+  getPrevious(startDate: number) {
+    const now = Date.now();
+    const previousMonth = new Date(now);
+    previousMonth.setMonth(previousMonth.getMonth() - 1);
+    return CalendarInterval.getInterval(startDate, previousMonth.valueOf());
+  }
+
 }

webapp/src/ts/services/rules-engine.service.ts

@@ -496,14 +496,12 @@ export class RulesEngineService implements OnDestroy {
     let trackPerformanceRunning;
 
     await this.initialized;
-    this.telemetryService.record(
-      'rules-engine:targets:dirty-contacts',
-      this.rulesEngineCore.getDirtyContacts().length
-    );
+    this.telemetryService.record('rules-engine:targets:dirty-contacts', this.rulesEngineCore.getDirtyContacts().length);
     this.cancelDebounce(this.FRESHNESS_KEY);
     await this.waitForDebounce(this.CHANGE_WATCHER_KEY);
 
     const relevantInterval = this.calendarIntervalService.getCurrent(this.uhcMonthStartDate);
+
     const targets = await this.rulesEngineCore
       .fetchTargets(relevantInterval)
       .on('queued', () => trackPerformanceQueueing = this.performanceService.track())
@@ -516,6 +514,7 @@ export class RulesEngineService implements OnDestroy {
       trackPerformanceRunning = this.performanceService.track();
     }
     trackPerformanceRunning?.stop({ name: trackName });
+
     return targets;
   }