sudacode/ghostfolio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Feature/improve check for duplicates in import #1932 (#1940)

Browse Source 
* Improve check for duplicates in import

* Update changelog
This commit is contained in:
Visrut
2023-05-09 01:15:59 +05:30
committed by GitHub
parent b923cf7752
commit 7d6a74a67d
6 changed files with 129 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ui/src/lib/activities-table/activities-table.component.html
View File

@@ -76,7 +76,6 @@
<ng-container matColumnDef="select">
<th *matHeaderCellDef class="px-1" mat-header-cell>
<mat-checkbox
class="mt-2"
color="primary"
[checked]="selectedRows.hasValue() && areAllRowsSelected()"
[indeterminate]="selectedRows.hasValue() && !areAllRowsSelected()"
@@ -85,9 +84,11 @@
</th>
<td *matCellDef="let element" class="px-1" mat-cell>
<mat-checkbox
class="mt-2"
color="primary"
[checked]="selectedRows.isSelected(element)"
[checked]="
element.isDuplicate ? false : selectedRows.isSelected(element)
"
[disabled]="element.isDuplicate"
(change)="$event ? selectedRows.toggle(element) : null"
(click)="$event.stopPropagation()"
></mat-checkbox>

4
libs/ui/src/lib/activities-table/activities-table.component.ts
View File

@@ -177,7 +177,9 @@ export class ActivitiesTableComponent implements OnChanges, OnDestroy, OnInit {
public onClickActivity(activity: Activity) {
if (this.showCheckbox) {
this.selectedRows.toggle(activity);
if (!activity.isDuplicate) {
this.selectedRows.toggle(activity);
}
} else if (
this.hasPermissionToOpenDetails &&
!activity.isDraft &&