Skip to content

Commit 6b925ca

Browse files
committed
Rename is decisive to is executive
1 parent 2b856e0 commit 6b925ca

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

src/components/annotations/AnnotationDataTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
:class="{ 'pi-check-circle text-green-500': slotProps.data.is_flagged, 'pi-times-circle text-red-400': !slotProps.data.is_flagged }" />
3333
</template>
3434
</Column>
35-
<Column field="is_decisive" header="Is Decisive" dataType="boolean" style="min-width: 6rem">
35+
<Column field="is_decisive" header="Is executive" dataType="boolean" style="min-width: 6rem">
3636
<template #body="slotProps">
3737
<i class="pi"
3838
:class="{ 'pi-check-circle text-green-500': slotProps.data.is_decisive, 'pi-times-circle text-red-400': !slotProps.data.is_decisive }" />

src/components/annotations/AnnotationDecisiveTag.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<Tag severity="contrast" value="Decisive" rounded
2+
<Tag severity="contrast" value="Executive" rounded
33
v-tooltip.top="'This annotation determines the final identification task result.'">
44
<template #icon>
55
<span class="material-symbols-outlined p-tag-icon">

src/components/annotations/AnnotationForm.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
<Message v-if="$field?.invalid" severity="error" size="small" variant="simple">{{ $field.error?.message }}
1414
</Message>
1515
</FormField>
16-
<FormField v-slot="$field" name="isDecisive" :initial-value="false" class="flex ml-auto items-center gap-2">
17-
<label>Is decisive?</label>
18-
<ToggleSwitch v-model="isDecisive" :disabled="isFlagged" />
16+
<FormField v-slot="$field" name="isExecutive" :initial-value="false" class="flex ml-auto items-center gap-2">
17+
<label>Is executive?</label>
18+
<ToggleSwitch v-model="isExecutive" :disabled="isFlagged" />
1919
<Message v-if="$field?.invalid" severity="error" size="small" variant="simple">{{ $field.error?.message }}
2020
</Message>
2121
</FormField>
@@ -118,7 +118,7 @@ import { getPublicNote } from '@/utils/AnnotationUtils';
118118
const toast = useToast();
119119
120120
const isHighConfidence = ref<boolean>(false);
121-
const isDecisive = ref<boolean>(false);
121+
const isExecutive = ref<boolean>(false);
122122
const selectedTaxon = ref<Taxon>();
123123
const selectedSex = ref<Sex>('unknown');
124124
const selectedTags = ref<string[]>([]);
@@ -134,11 +134,11 @@ const props = withDefaults(defineProps<{
134134
annotationType: AnnotationType,
135135
isFlagged?: boolean,
136136
isFavourite?: boolean,
137-
canSetIsDecisive?: boolean
137+
canSetIsExecutive?: boolean
138138
}>(), {
139139
isFlagged: false,
140140
isFavourite: false,
141-
canSetIsDecisive: true
141+
canSetIsExecutive: true
142142
});
143143
144144
const emit = defineEmits<{
@@ -156,7 +156,7 @@ const isFemale = computed(() => {
156156
// Watch for isFlagged changes
157157
watch(() => props.isFlagged, (newVal) => {
158158
if (newVal) {
159-
isDecisive.value = false;
159+
isExecutive.value = false;
160160
}
161161
});
162162
@@ -207,7 +207,7 @@ const onFormSubmit = ({ valid, values }: { valid: boolean, values: Record<string
207207
internal_note: values.internalNote
208208
} as AnnotationFeedbackRequest,
209209
is_flagged: props.isFlagged,
210-
is_decisive: values.isDecisive,
210+
is_decisive: values.isExecutive,
211211
is_favourite: props.isFavourite,
212212
tags: selectedTags.value
213213
}

src/components/annotations/AnnotationPanel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Avatar icon="pi pi-user" shape="circle" :label="getInitials(annotation?.user.full_name || '')" />
66
<span class="font-bold">{{ annotation?.user.full_name }}</span>
77
<Tag v-if="annotation?.is_flagged" icon="pi pi-flag" severity="danger" value="Flagged" rounded />
8-
<Tag v-if="annotation?.is_decisive" severity="contrast" value="Decisive" rounded
8+
<Tag v-if="annotation?.is_decisive" severity="contrast" value="Executive" rounded
99
v-tooltip.top="'This annotation determines the final identification task result.'">
1010
<template #icon>
1111
<!-- <i class="fa fa-gavel" /> -->

src/views/annotations/ListView.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<label for="is_flagged">Flag</label>
4343
</FloatLabel>
4444
<FloatLabel variant="on">
45-
<Select id="is_decisive" v-model="isDecisive" class="w-28" :options="[true, false]" showClear />
46-
<label for="is_decisive">Decisive</label>
45+
<Select id="is_executive" v-model="isExecutive" class="w-28" :options="[true, false]" showClear />
46+
<label for="is_executive">Executive</label>
4747
</FloatLabel>
4848
<FloatLabel variant="on">
4949
<Select id="is_favourite" v-model="isFavourite" class="w-28" :options="[true, false]" showClear />
@@ -98,7 +98,7 @@ const showFilters = ref<boolean>(false);
9898
9999
// Filters
100100
const selectedDateRange = ref<Date[]>();
101-
const isDecisive = ref<boolean>();
101+
const isExecutive = ref<boolean>();
102102
const isFlagged = ref<boolean>();
103103
const isFavourite = ref<boolean>();
104104
const selectedTaxon = ref<Taxon | null>(null);
@@ -129,7 +129,7 @@ const listRequest = ref<IdentificationTasksApiAnnotationsListMineRequest>();
129129
130130
function clearFilters() {
131131
selectedDateRange.value = undefined;
132-
isDecisive.value = undefined;
132+
isExecutive.value = undefined;
133133
isFlagged.value = undefined;
134134
isFavourite.value = undefined;
135135
selectedTaxon.value = null;
@@ -147,7 +147,7 @@ onMounted(() => {
147147
] as Date[];
148148
}
149149
150-
isDecisive.value = q.isDecisive ? Boolean(JSON.parse(q.isDecisive as string)) : undefined;
150+
isExecutive.value = q.isDecisive ? Boolean(JSON.parse(q.isDecisive as string)) : undefined;
151151
isFlagged.value = q.isFlagged ? Boolean(JSON.parse(q.isFlagged as string)) : undefined;
152152
isFavourite.value = q.isFavourite ? Boolean(JSON.parse(q.isFavourite as string)) : undefined;
153153
@@ -181,7 +181,7 @@ watchEffect(async () => {
181181
listRequest.value = {
182182
updatedAtAfter: selectedDateRange.value && selectedDateRange.value.length > 1 ? selectedDateRange.value[0].toISOString() : undefined,
183183
updatedAtBefore: selectedDateRange.value && selectedDateRange.value.length > 1 ? new Date(new Date(selectedDateRange.value[1]).setDate(selectedDateRange.value[1].getDate() + 1)).toISOString() : undefined,
184-
isDecisive: isDecisive.value ?? undefined,
184+
isDecisive: isExecutive.value ?? undefined,
185185
isFlagged: isFlagged.value ?? undefined,
186186
isFavourite: isFavourite.value ?? undefined,
187187
classificationTaxonIds: selectedTaxon.value?.id ? [selectedTaxon.value.id] : undefined,

0 commit comments

Comments
 (0)