Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some small issues on dataset view #1935

Merged
merged 2 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private Dataset updateDatasetValues(final Dataset datasetDb, final Dataset datas
datasetDb.setId(dataset.getId());
datasetDb.setProcessings(dataset.getProcessings());
datasetDb.setSubjectId(dataset.getSubjectId());
if (dataset.getOriginMetadata().getId().equals(dataset.getUpdatedMetadata().getId())) {
if (dataset.getUpdatedMetadata().getId().equals(dataset.getOriginMetadata().getId())) {
// Force creation of a new dataset metadata
dataset.getUpdatedMetadata().setId(null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,15 @@
</li>
<li>
<label i18n="Dataset detail|Dataset subject@@datasetDetailSubject">Subject</label>
<span class="right-col" [ngSwitch]="mode">
<ng-template [ngSwitchCase]="'view'">
<span class="right-col">
<a [routerLink]="[getSubjectLink()]">
{{dataset.subject?.name}}
</a>
</ng-template>
<ng-template ngSwitchDefault>
<select-box [(ngModel)]="dataset.subject" formControlName="subject" [optionArr]="subjects">
</select-box>
</ng-template>
</span>
</li>
<li>
<label i18n="Dataset detail|Dataset study@@datasetDetailStudy">Study</label>
<span class="right-col" [ngSwitch]="mode">
<span class="right-col">
<a [routerLink]="['/study/details/', dataset.study?.id]">
{{dataset.study?.name}}
</a>
Expand All @@ -83,14 +77,8 @@
</li>
<li>
<label i18n="Dataset detail|Dataset type@@datasetDetailType">Modality type</label>
<span class="right-col" [ngSwitch]="mode">
<ng-template [ngSwitchCase]="'view'">
<span class="right-col">
{{dataset.type}}
</ng-template>
<ng-template ngSwitchDefault>
<select-box [ngModelOptions]="{standalone: true}" [(ngModel)]="dataset.type" [options]="datasetTypes">
</select-box>
</ng-template>
</span>
</li>
</ol>
Expand Down Expand Up @@ -128,7 +116,7 @@
<li>
<label i18n="Dataset detail|Dataset explored entity type@@datasetExploredEntity">Explored entity</label>
<span class="right-col" [ngSwitch]="mode">
<ng-template [ngSwitchCase]="'view'">{{dataset.updatedMetadata.exploredEntity? dataset.updatedMetadata.exploredEntity : dataset.originMetadata.exploredEntity}}</ng-template>
<ng-template [ngSwitchCase]="'view'">{{ExploredEntity.getLabel(dataset.updatedMetadata.exploredEntity? dataset.updatedMetadata.exploredEntity : dataset.originMetadata.exploredEntity)}}</ng-template>
<ng-template ngSwitchDefault>
<select-box
[ngModel]="dataset.updatedMetadata.exploredEntity ? dataset.updatedMetadata.exploredEntity : dataset.originMetadata.exploredEntity"
Expand All @@ -141,9 +129,9 @@
</span>
</li>
<li>
<label i18n="Dataset detail|Dataset cardinality of releted subjects@@datasetCardinalityOfRelatedSubjects">Cardinality of releted subjects</label>
<label i18n="Dataset detail|Dataset cardinality of related subjects@@datasetCardinalityOfRelatedSubjects">Cardinality of related subjects</label>
<span class="right-col" [ngSwitch]="mode">
<ng-template [ngSwitchCase]="'view'">{{dataset.updatedMetadata.cardinalityOfRelatedSubjects ? dataset.updatedMetadata.cardinalityOfRelatedSubjects : dataset.originMetadata.cardinalityOfRelatedSubjects}}</ng-template>
<ng-template [ngSwitchCase]="'view'">{{ CardinalityOfRelatedSubjects.getLabel(dataset.updatedMetadata.cardinalityOfRelatedSubjects ? dataset.updatedMetadata.cardinalityOfRelatedSubjects : dataset.originMetadata.cardinalityOfRelatedSubjects)}}</ng-template>
<ng-template ngSwitchDefault>
<input type="radio" name="card" id="card_single"
[ngModel]="dataset.updatedMetadata.cardinalityOfRelatedSubjects ? dataset.updatedMetadata.cardinalityOfRelatedSubjects : dataset.originMetadata.cardinalityOfRelatedSubjects"
Expand All @@ -163,7 +151,7 @@
<li>
<label i18n="Dataset detail|Dataset processed type subjects@@datasetProcessedType">Processed Type</label>
<span class="right-col" [ngSwitch]="mode">
<ng-template [ngSwitchCase]="'view'">{{dataset.updatedMetadata.processedDatasetType? dataset.updatedMetadata.processedDatasetType : dataset.originMetadata.processedDatasetType}}</ng-template>
<ng-template [ngSwitchCase]="'view'">{{ ProcessedDatasetType.getLabel(dataset.updatedMetadata.processedDatasetType? dataset.updatedMetadata.processedDatasetType : dataset.originMetadata.processedDatasetType)}}</ng-template>
<ng-template ngSwitchDefault>
<select-box
[ngModel]="dataset.updatedMetadata.processedDatasetType ? dataset.updatedMetadata.processedDatasetType : dataset.originMetadata.processedDatasetType"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { DatasetModalityType } from '../../../enum/dataset-modality-type.enum';
import { DatasetProcessingType } from '../../../enum/dataset-processing-type.enum';
import { ProcessedDatasetType } from '../../../enum/processed-dataset-type.enum';
import { DatasetType } from '../../shared/dataset-type.model';
import {CardinalityOfRelatedSubjects} from "../../../enum/cardinality-of-related-subjects.enum";

@Component({
selector: 'common-dataset-details',
Expand All @@ -43,6 +44,10 @@ export class CommonDatasetComponent implements OnChanges {
exploredEntityOptions: Option<ExploredEntity>[];
datasetTypes: Option<DatasetType>[];
processedDatasetTypeOptions: Option<ProcessedDatasetType>[];
CardinalityOfRelatedSubjects = CardinalityOfRelatedSubjects;
ExploredEntity = ExploredEntity;
ProcessedDatasetType = ProcessedDatasetType;


constructor(
private studyService: StudyService,
Expand Down
12 changes: 8 additions & 4 deletions shanoir-ng-front/src/app/datasets/dataset/dataset.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
* Shanoir NG - Import, manage and share neuroimaging data
* Copyright (C) 2009-2019 Inria - https://www.inria.fr/
* Contact us on https://project.inria.fr/shanoir/
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see https://www.gnu.org/licenses/gpl-3.0.html
*/
Expand Down Expand Up @@ -128,7 +128,7 @@ export class DatasetComponent extends EntityComponent<Dataset> {
convertNiftiToggle() {
this.toggleMenu();
}

convertNifti(id: number) {
this.downloadState.status = TaskStatus.IN_PROGRESS;
this.datasetService.download(this.dataset, 'nii', id).then(() => this.downloadState.status = TaskStatus.IN_PROGRESS);
Expand Down Expand Up @@ -187,4 +187,8 @@ export class DatasetComponent extends EntityComponent<Dataset> {
seeDicomMetadata() {
this.router.navigate(['/dataset/details/dicom/' + this.dataset.id]);
}
}

goToList(): void {
this.router.navigate(['/solr-search']);
}
}
Loading