From 4a97bd6565f11b63a2365e7d920025ecc1f368ec Mon Sep 17 00:00:00 2001 From: Iris Faey Hoffmeyer Date: Tue, 2 Jul 2024 04:51:28 -0400 Subject: [PATCH 1/3] Prevent Non-Selectable objects from being selected --- components/viewer/ViewProjectObj.vue | 7 ++++++- composables/project.ts | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/components/viewer/ViewProjectObj.vue b/components/viewer/ViewProjectObj.vue index 9dbc31f..6407ca0 100644 --- a/components/viewer/ViewProjectObj.vue +++ b/components/viewer/ViewProjectObj.vue @@ -105,7 +105,12 @@ const maxSelectedAmount = computed(() => ); const toggle = () => { - if (isEnabled.value && !obj.isSelectableMultiple) { + if ( + isEnabled.value && + !obj.isSelectableMultiple && + !obj.isNotSelectable && + !row.isInfoRow + ) { if (obj.activateOtherChoice) { R.split(',', obj.activateThisChoice).forEach((id) => { store.setSelected(id, !isSelected.value); diff --git a/composables/project.ts b/composables/project.ts index bc83bee..d6a0d00 100644 --- a/composables/project.ts +++ b/composables/project.ts @@ -47,6 +47,7 @@ export type ProjectObj = HasId & activateThisChoice: string; isSelectableMultiple: boolean; + isNotSelectable: boolean; numMultipleTimesMinus: string; numMultipleTimesPluss: string; }; @@ -62,6 +63,7 @@ export type ProjectRow = HasId & resultGroupId: string; allowedChoices: number; + isInfoRow: boolean; objects: ProjectObj[]; }; From 6d7d7e26030b55be261f64748bb13233f66a33bc Mon Sep 17 00:00:00 2001 From: Iris Faey Hoffmeyer Date: Tue, 2 Jul 2024 05:12:10 -0400 Subject: [PATCH 2/3] Don't show border if object isn't selectable --- components/viewer/ViewProjectObj.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/components/viewer/ViewProjectObj.vue b/components/viewer/ViewProjectObj.vue index 6407ca0..8641813 100644 --- a/components/viewer/ViewProjectObj.vue +++ b/components/viewer/ViewProjectObj.vue @@ -2,7 +2,11 @@
@@ -161,6 +165,11 @@ const decrement = () => { background-color: gray; } + &.notSelectable { + border: none; + border-radius: none; + } + .obj-image { width: 100%; aspect-ratio: 5/3; From b06d59d6b12286e1e18dbf6319f4070e80bd7ca6 Mon Sep 17 00:00:00 2001 From: Iris Faey Hoffmeyer Date: Tue, 2 Jul 2024 05:13:26 -0400 Subject: [PATCH 3/3] Center row text It was really bothering that they weren't centered once I noticed... --- components/viewer/ViewProjectRow.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/components/viewer/ViewProjectRow.vue b/components/viewer/ViewProjectRow.vue index f152870..b301946 100644 --- a/components/viewer/ViewProjectRow.vue +++ b/components/viewer/ViewProjectRow.vue @@ -61,6 +61,7 @@ const isVisible = computed(() => condition(selectedIds.value)); .row-text { padding: 5px; + text-align: center; } } }