From 70acaf9738e1fda61a47e83cb52e675938c1206b Mon Sep 17 00:00:00 2001 From: ThompsonNye Date: Mon, 16 Jun 2025 18:20:17 +0200 Subject: [PATCH] Copy overview page structure from weight tracker --- .../entries/entries/entries.component.html | 61 ++++++++++++------- .../entries/entries/entries.component.ts | 33 ++++++++-- 2 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html index ab67d54..7cd05d7 100644 --- a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html +++ b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.html @@ -1,22 +1,41 @@ -@if (consumptionEntries$ | async; as consumptionEntries) { -
- - - - - - - - - - @for (entry of consumptionEntries; track entry.id) { - - - - - +
+ +
+
+ +
+
+ + + +
+
+
+ @if (filteredWeightEntries$ | async; as weightEntries) { + + +
+ @for (weightEntry of entries; track weightEntry.id) { + + } +
+
+
+ } @else { +
+ @for (_ of skeletonsIterationSource; track $index) { + } -
-
DatumDistanzMenge
{{ entry.dateTime | date }}{{ entry.distance }} km{{ entry.amount }} l
-
-} + + } + + diff --git a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts index 7015883..1bc6dc1 100644 --- a/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts +++ b/src/Vegasco-Web/src/app/modules/entries/entries/entries.component.ts @@ -1,12 +1,37 @@ -import { AsyncPipe, DatePipe } from '@angular/common'; -import { HttpClient } from '@angular/common/http'; +import { CommonModule } from '@angular/common'; import { Component, inject } from '@angular/core'; +import { FormControl, ReactiveFormsModule } from '@angular/forms'; +import { RouterLink } from '@angular/router'; +import { MessageService } from 'primeng/api'; +import { ButtonModule } from 'primeng/button'; +import { DataViewModule } from 'primeng/dataview'; +import { SelectModule } from 'primeng/select'; +import { ScrollTopModule } from 'primeng/scrolltop'; +import { SkeletonModule } from 'primeng/skeleton'; +import { + BehaviorSubject, + combineLatest, + map, + Observable, + of, + startWith, + tap, +} from 'rxjs'; +import { HttpClient } from '@angular/common/http'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { map, Observable, tap } from 'rxjs'; @Component({ selector: 'app-entries', - imports: [AsyncPipe, DatePipe], + imports: [ + ButtonModule, + CommonModule, + DataViewModule, + SkeletonModule, + SelectModule, + ReactiveFormsModule, + RouterLink, + ScrollTopModule, + ], templateUrl: './entries.component.html', styleUrl: './entries.component.scss' })