resolved all conflicts

This commit is contained in:
2025-01-07 07:25:42 +00:00
3 changed files with 12 additions and 9 deletions

View File

@@ -19,11 +19,13 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr *ngFor="let backup of backupVolumes"> <ng-container *ngFor="let backup of backupVolumes">
<td><a target="_blank" [href]=backup.projectURL>{{backup.projectName}}</a></td> <tr *ngIf="backup.backupDay.includes(today)">
<td><a target="_blank" [href]=backup.volumeURL>{{backup.volumeName}}</a></td> <td><a target="_blank" [href]=backup.projectURL>{{backup.projectName}}</a></td>
<td class="copyName" #copy (click)="copyName(copy)">{{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud</td> <td><a target="_blank" [href]=backup.volumeURL>{{backup.volumeName}}</a></td>
</tr> <td class="copyName" #copy (click)="copyName(copy)">{{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud</td>
</tr>
</ng-container>
</tbody> </tbody>
</table> </table>
</div> </div>

View File

@@ -23,8 +23,8 @@ export class BackupListComponent implements OnInit, OnDestroy{
innerHTML!: string; innerHTML!: string;
backupVolumesSubscription!: Subscription; backupVolumesSubscription!: Subscription;
searchTerm: FormControl = new FormControl(); searchTerm: FormControl = new FormControl();
days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
today!: string;
constructor(private backupService: BackupService, private searchService: searchService) {} 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.backupVolumesSubscription = this.backupService.allBackups().subscribe((volumes)=>{
this.backupVolumes = volumes; this.backupVolumes = volumes;
}); });
this.today = this.days[this.currentDate.getDay()];
} }
ngOnDestroy(): void { ngOnDestroy(): void {

View File

@@ -3,5 +3,5 @@ export class Backup{
projectURL!: string; projectURL!: string;
volumeName!: string; volumeName!: string;
volumeURL!: string; volumeURL!: string;
day!: string; backupDay!: string[];
} }