added
This commit is contained in:
@@ -19,11 +19,21 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
<<<<<<< HEAD
|
||||||
<tr *ngFor="let backup of backupVolumes">
|
<tr *ngFor="let backup of backupVolumes">
|
||||||
<td><a target="_blank" [href]=backup.projectURL>{{backup.projectName}}</a></td>
|
<td><a target="_blank" [href]=backup.projectURL>{{backup.projectName}}</a></td>
|
||||||
<td><a target="_blank" [href]=backup.volumeURL>{{backup.volumeName}}</a></td>
|
<td><a target="_blank" [href]=backup.volumeURL>{{backup.volumeName}}</a></td>
|
||||||
<td class="copyName" #copy (click)="copyName(copy)">{{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud</td>
|
<td class="copyName" #copy (click)="copyName(copy)">{{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
=======
|
||||||
|
<ng-container *ngFor="let backup of backupVolumes">
|
||||||
|
<tr *ngIf="backup.backupDay.includes(today)">
|
||||||
|
<td><a target="_blank" [href]=backup.projectURL>{{backup.projectName}}</a></td>
|
||||||
|
<td><a target="_blank" [href]=backup.volumeURL>{{backup.volumeName}}</a></td>
|
||||||
|
<td class="copyName" #copy (click)="copyName(copy)">{{backup.volumeName}}-{{currentDate | date: 'dd-MM-YYYY'}}-Cloud</td>
|
||||||
|
</tr>
|
||||||
|
</ng-container>
|
||||||
|
>>>>>>> 01af0bf3951d914c030f1d261a3f1a53c28f6d10
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -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 {
|
||||||
|
|||||||
@@ -3,5 +3,9 @@ export class Backup{
|
|||||||
projectURL!: string;
|
projectURL!: string;
|
||||||
volumeName!: string;
|
volumeName!: string;
|
||||||
volumeURL!: string;
|
volumeURL!: string;
|
||||||
|
<<<<<<< HEAD
|
||||||
day!: string;
|
day!: string;
|
||||||
|
=======
|
||||||
|
backupDay!: string[];
|
||||||
|
>>>>>>> 01af0bf3951d914c030f1d261a3f1a53c28f6d10
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user