diff --git a/shanoir-ng-front/src/app/import/select-series/select-series.component.html b/shanoir-ng-front/src/app/import/select-series/select-series.component.html index 4f0b75c5e2..6e0645d6bc 100644 --- a/shanoir-ng-front/src/app/import/select-series/select-series.component.html +++ b/shanoir-ng-front/src/app/import/select-series/select-series.component.html @@ -51,7 +51,7 @@ awesome="fa fa-brain" hasBox="true" [(ngModel)]="serie.selected" - (chkbxChange)="onSerieCheckChange($event, study, patient)" + (chkbxChange)="onSerieCheckChange(study, patient)" (labelClick)="showSerieDetails(serie)" [class.selected]="detailedSerie == serie" [ngModelOptions]="{standalone: true}" diff --git a/shanoir-ng-front/src/app/import/select-series/select-series.component.ts b/shanoir-ng-front/src/app/import/select-series/select-series.component.ts index ddaa0f302a..34ddcb57ea 100644 --- a/shanoir-ng-front/src/app/import/select-series/select-series.component.ts +++ b/shanoir-ng-front/src/app/import/select-series/select-series.component.ts @@ -97,22 +97,21 @@ export class SelectSeriesComponent { this.onPatientUpdate(); } - onSerieCheckChange(checked: boolean, study: StudyDicom, patient: PatientDicom) { - + onSerieCheckChange(study: StudyDicom, patient: PatientDicom) { if (study.series) { let nbChecked: number = 0; study.series.forEach(serie => { if (serie.selected) nbChecked++; }); if (nbChecked == study.series.length) { - this.studiesCheckboxes[study.studyInstanceUID] = true; - study.selected = true; + this.studiesCheckboxes[study.studyInstanceUID] = true; + study.selected = true; } else if (nbChecked == 0) { - study.selected = false; - this.studiesCheckboxes[study.studyInstanceUID] = false; + study.selected = false; + this.studiesCheckboxes[study.studyInstanceUID] = false; } else { - this.studiesCheckboxes[study.studyInstanceUID] = 'indeterminate'; - study.selected = true; + this.studiesCheckboxes[study.studyInstanceUID] = 'indeterminate'; + study.selected = true; } } this.onPatientUpdate(); diff --git a/shanoir-ng-front/src/app/shared/components/tree/tree-node.component.ts b/shanoir-ng-front/src/app/shared/components/tree/tree-node.component.ts index e7db29d5b3..20d19b7bb3 100644 --- a/shanoir-ng-front/src/app/shared/components/tree/tree-node.component.ts +++ b/shanoir-ng-front/src/app/shared/components/tree/tree-node.component.ts @@ -154,7 +154,7 @@ export class TreeNodeComponent implements ControlValueAccessor, OnChanges { writeValue(value: any) { if (value !== this.checked) { this.checked = value; - this.chkbxChange.emit(value); + //this.chkbxChange.emit(value); } }