diff --git a/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart-input/ai-chart-input.component.ts b/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart-input/ai-chart-input.component.ts
index 215965a..d328b77 100644
--- a/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart-input/ai-chart-input.component.ts
+++ b/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart-input/ai-chart-input.component.ts
@@ -38,7 +38,7 @@ export class AiChartInputComponent {
generateChart() {
this._status.generating = true;
this.status.emit(this._status);
- this.dataService.generateChart(this.question, '30ee4df6-b311-4774-bbbd-3bdc52753f4a')
+ this.dataService.generateChart(this.question)
.pipe(
takeUntilDestroyed(this.destroyRef),
tap((data) => {
diff --git a/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart/ai-chart.component.ts b/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart/ai-chart.component.ts
deleted file mode 100644
index 53365eb..0000000
--- a/report-builder/src/app/report-builder/chart-panel/chart-config-panel/ai-chart/ai-chart.component.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-import { Component, DestroyRef, inject } from '@angular/core';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { MatButtonModule } from '@angular/material/button';
-import { DataService } from '../../../shared/services/data.service';
-import { ChartService } from '../../../shared/services/chart.service';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { FormsModule } from '@angular/forms';
-import { tap } from 'rxjs/operators';
-import { CHARTS } from '../../../shared/constants/charts.constant';
-
-@Component({
- selector: 'app-ai-chart',
- standalone: true,
- imports: [MatFormFieldModule, MatInputModule, FormsModule, MatButtonModule],
- templateUrl: './ai-chart.component.html',
- styleUrl: './ai-chart.component.scss'
-})
-export class AiChartComponent {
- private dataService = inject(DataService);
- private chartService = inject(ChartService);
- private readonly destroyRef = inject(DestroyRef);
-
- question!: string;
-
- generateChart() {
- this.dataService.generateChart(this.question, '30ee4df6-b311-4774-bbbd-3bdc52753f4a')
- .pipe(
- takeUntilDestroyed(this.destroyRef),
- tap((data) => {
- const slots = data?.generatedChart?.slots;
- const emptySlots = CHARTS().find((chart) => chart.type === data?.generatedChart?.type);
- if (emptySlots) {
- emptySlots.slots.forEach((slot) => {
- if (!slots.find((s) => s.name === slot.name)) {
- slots.push({ name: slot.name, content: [] });
- }
- });
- }
- const type = data?.generatedChart?.type;
- if (type) {
- this.chartService.updateType(type);
- }
- if (slots) {
- this.chartService.updateSlots(slots);
- }
- })
- )
- .subscribe();
- }
-}
diff --git a/report-builder/src/app/report-builder/data-panel/data-panel.component.ts b/report-builder/src/app/report-builder/data-panel/data-panel.component.ts
index 61ccca5..7401607 100644
--- a/report-builder/src/app/report-builder/data-panel/data-panel.component.ts
+++ b/report-builder/src/app/report-builder/data-panel/data-panel.component.ts
@@ -134,6 +134,7 @@ export class DataPanelComponent implements OnInit {
.pipe(takeUntilDestroyed(this.destroyRef))
.subscribe((dataset) => {
this.updateColumnList([dataset.datasetId]);
+ this.dataService.setDatasetIdForAI(dataset.datasetId);
});
this.selectedDatasets.valueChanges
diff --git a/report-builder/src/app/report-builder/shared/services/data.service.ts b/report-builder/src/app/report-builder/shared/services/data.service.ts
index ccb1651..d82549c 100644
--- a/report-builder/src/app/report-builder/shared/services/data.service.ts
+++ b/report-builder/src/app/report-builder/shared/services/data.service.ts
@@ -11,6 +11,7 @@ export class DataService {
private readonly authService = inject(AuthService);
authKey: string;
authToken?: string;
+ datasetIdForAI = '70902e57-8c32-4890-a728-650c686c1f5d';
// cache: Record
= {};
client: Luzmo;
@@ -27,10 +28,14 @@ export class DataService {
});
}
- generateChart(question: string, datasetId: string): Observable {
+ setDatasetIdForAI(datasetId: string) {
+ this.datasetIdForAI = datasetId;
+ }
+
+ generateChart(question: string): Observable {
return from(this.client.create(('aichart' as any), {
type: 'generate-chart',
- dataset_id: datasetId,
+ dataset_id: this.datasetIdForAI,
question: question,
model_preference: 'performance'
}));
diff --git a/wearables-dashboard/src/components/Analytics/Analytics.tsx b/wearables-dashboard/src/components/Analytics/Analytics.tsx
index cd88781..065c3d0 100644
--- a/wearables-dashboard/src/components/Analytics/Analytics.tsx
+++ b/wearables-dashboard/src/components/Analytics/Analytics.tsx
@@ -99,13 +99,13 @@ export default function Analytics() {
setSleepScoreYesterday(
sleepScores.lastNightSleepScore > -1
? Math.round(sleepScores.lastNightSleepScore * 100)
- : undefined
+ : -1
);
setSleepScoreDayBefore(
sleepScores.previousNightSleepScore > -1
? Math.round(sleepScores.previousNightSleepScore * 100)
- : undefined
+ : -1
);
});
}, [user]);
@@ -115,7 +115,7 @@ export default function Analytics() {
setStepsToday(undefined);
- // Fetch sleep score from yesterday
+ // Fetch number of steps per day
getStepsPerDay(user.id).then((stepsPerDay) => {
// Check if the first entry is from today & set the steps
setStepsToday(
@@ -268,6 +268,7 @@ export default function Analytics() {
>
{hasSleepData &&
sleepScoreYesterday !== undefined &&
+ sleepScoreYesterday !== -1 &&
sleepScoreDayBefore !== undefined && (
Your sleep score was {sleepScoreYesterday}%{" "}
@@ -285,6 +286,11 @@ export default function Analytics() {
Loading sleep insights...
)}
+ {hasSleepData && sleepScoreYesterday === -1 && (
+
+ No sleep insights yet for yesterday's night
+
+ )}
{hasStepsData && stepsToday !== undefined && (
Based on your walking history, you should have used about{" "}