Skip to content

Commit 8ff556f

Browse files
refactor: update trigger handling and improve component logic
- Updated RecommendationsComponent to fetch active triggers instead of all triggers. - Refactored UsageAddComponent to retrieve active triggers for better performance. - Enhanced RecoveryDashboardComponent to store active trigger names for analysis. - Modified trigger management UI to improve layout and display archived triggers more clearly. - Changed trigger fetching method in TriggersComponent to only retrieve active triggers.
1 parent 6aab105 commit 8ff556f

8 files changed

Lines changed: 640 additions & 628 deletions

File tree

src/app/components/substance/record-substance-use.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class RecordSubstanceUseComponent implements OnInit {
144144
const now = new Date();
145145
this.datetime = now;
146146

147-
this.triggerService.list().then((triggers) => {
147+
this.triggerService.getActiveTriggers().then((triggers) => {
148148
this.triggers = triggers as TriggerDto[];
149149
console.log("Triggers:", this.triggers);
150150
});

src/app/components/substance/substance-analysis-card.component.ts

Lines changed: 363 additions & 358 deletions
Large diffs are not rendered by default.
Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
import { Component, OnInit, inject } from '@angular/core';
2-
import { CommonModule, NgComponentOutlet } from '@angular/common';
3-
import { ButtonModule } from 'primeng/button';
4-
import { TableModule } from 'primeng/table';
5-
import { PanelModule } from 'primeng/panel';
6-
import { JoyrideModule } from 'ngx-joyride';
7-
import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
8-
9-
import { TriggerService } from '../../services/trigger.service';
10-
import { TriggerDto } from '../../dto/trigger.dto';
11-
import { RecommendationComponent } from '../recommendation/recommendation.component';
12-
13-
14-
@Component({
15-
selector: 'app-recommendations',
16-
standalone: true,
17-
imports: [
18-
ButtonModule,
19-
TableModule,
20-
PanelModule,
21-
NgComponentOutlet,
22-
RecommendationComponent,
23-
CommonModule,
24-
JoyrideModule,
25-
TranslocoModule,
26-
],
27-
templateUrl: './recommendations.component.html',
28-
styleUrl: './recommendations.component.scss'
29-
})
1+
import { Component, OnInit, inject } from '@angular/core';
2+
import { CommonModule, NgComponentOutlet } from '@angular/common';
3+
import { ButtonModule } from 'primeng/button';
4+
import { TableModule } from 'primeng/table';
5+
import { PanelModule } from 'primeng/panel';
6+
import { JoyrideModule } from 'ngx-joyride';
7+
import { TranslocoModule, TranslocoService } from '@jsverse/transloco';
8+
9+
import { TriggerService } from '../../services/trigger.service';
10+
import { TriggerDto } from '../../dto/trigger.dto';
11+
import { RecommendationComponent } from '../recommendation/recommendation.component';
12+
13+
14+
@Component({
15+
selector: 'app-recommendations',
16+
standalone: true,
17+
imports: [
18+
ButtonModule,
19+
TableModule,
20+
PanelModule,
21+
NgComponentOutlet,
22+
RecommendationComponent,
23+
CommonModule,
24+
JoyrideModule,
25+
TranslocoModule,
26+
],
27+
templateUrl: './recommendations.component.html',
28+
styleUrl: './recommendations.component.scss'
29+
})
3030
export class RecommendationsComponent implements OnInit {
3131
private triggerService = inject(TriggerService);
3232
private translateService = inject(TranslocoService);
33-
34-
35-
triggers: TriggerDto[];
36-
trigger: string;
37-
38-
ngOnInit(): void {
39-
this.triggerService.list().then(triggers => {
40-
this.triggers = triggers as TriggerDto[];
41-
});
42-
}
43-
44-
showRecommendation(trigger: string) {
45-
this.trigger = trigger;
46-
}
47-
48-
}
33+
34+
35+
triggers: TriggerDto[];
36+
trigger: string;
37+
38+
ngOnInit(): void {
39+
this.triggerService.getActiveTriggers().then(triggers => {
40+
this.triggers = triggers as TriggerDto[];
41+
});
42+
}
43+
44+
showRecommendation(trigger: string) {
45+
this.trigger = trigger;
46+
}
47+
48+
}

0 commit comments

Comments
 (0)