diff --git a/src/app/components/pages/backup-list/backup-list.component.html b/src/app/components/pages/backup-list/backup-list.component.html index 7a11521..0f26cea 100644 --- a/src/app/components/pages/backup-list/backup-list.component.html +++ b/src/app/components/pages/backup-list/backup-list.component.html @@ -19,11 +19,21 @@ +<<<<<<< HEAD {{backup.projectName}} {{backup.volumeName}} {{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud +======= + + + {{backup.projectName}} + {{backup.volumeName}} + {{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud + + +>>>>>>> 01af0bf3951d914c030f1d261a3f1a53c28f6d10 diff --git a/src/app/components/pages/backup-list/backup-list.component.ts b/src/app/components/pages/backup-list/backup-list.component.ts index f5fed31..10f027f 100644 --- a/src/app/components/pages/backup-list/backup-list.component.ts +++ b/src/app/components/pages/backup-list/backup-list.component.ts @@ -23,8 +23,8 @@ export class BackupListComponent implements OnInit, OnDestroy{ innerHTML!: string; backupVolumesSubscription!: Subscription; searchTerm: FormControl = new FormControl(); - - + days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat']; + today!: string; constructor(private backupService: BackupService, private searchService: searchService) {} @@ -32,6 +32,7 @@ export class BackupListComponent implements OnInit, OnDestroy{ this.backupVolumesSubscription = this.backupService.allBackups().subscribe((volumes)=>{ this.backupVolumes = volumes; }); + this.today = this.days[this.currentDate.getDay()]; } ngOnDestroy(): void { diff --git a/src/app/shared/model/backup.model.ts b/src/app/shared/model/backup.model.ts index 2ada993..9240674 100644 --- a/src/app/shared/model/backup.model.ts +++ b/src/app/shared/model/backup.model.ts @@ -3,5 +3,9 @@ export class Backup{ projectURL!: string; volumeName!: string; volumeURL!: string; +<<<<<<< HEAD day!: string; +======= + backupDay!: string[]; +>>>>>>> 01af0bf3951d914c030f1d261a3f1a53c28f6d10 } \ No newline at end of file