Skip to content

fix: fixed the cooperator view of moderated test #935

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.

Sign up for GitHub

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

Merged
marcgc21 merged 1 commit into from
Jul 4, 2025
Merged

fix: fixed the cooperator view of moderated test #935

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions src/components/organisms/ModeratedCoopsView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,19 @@
:key="comboboxKey"
ref="combobox"
v-model="comboboxModel"
:menu-props="{
rounded: 'xl',
}"
:menu-props="{ rounded: 'xl' }"
:hide-no-data="false"
:autofocus="comboboxKey == 0 ? false : true"
:autofocus="comboboxKey != 0"
style="background: #f5f7ff;"
:items="users"
:item-title="item => item?.email || 'Select an Email'"
:item-title="item => item?.email"
label="Select cooperator"
variant="outlined"
rounded
density="compact"
color="#fca326"
class="mx-2"
@update:model-value="verifyEmail()"
@update:model-value="verifyEmail"
>
<template #no-data>
There are no users registered with that email, press enter
Expand Down Expand Up @@ -218,7 +216,7 @@
position="fixed"
location="bottom right"
color="#F9A826"
:disabled="!comboboxModel.email"
:disabled="!(comboboxModel && comboboxModel?.email)"
v-bind="props"
@click="openInvitationModal()"
>
Expand Down Expand Up @@ -320,7 +318,7 @@
class="pa-0"
>
<v-text-field
:model-value="comboboxModel.email"
:model-value="comboboxModel?.email || ''"
density="compact"
disabled
variant="outlined"
Expand Down Expand Up @@ -349,7 +347,7 @@
v-model="date"
readonly
color="orange"
bg-color="grey lighten-3"
bg-color="grey-lighten-3"
v-bind="props"
variant="outlined"
density="compact"
Expand Down Expand Up @@ -388,7 +386,7 @@
v-model="hour"
prepend-icon="mdi-clock-time-four-outline"
density="compact"
bg-color="grey lighten-3"
bg-color="grey-lighten-3"
color="orange"
variant="outlined"
class="rounded-lg"
Expand All @@ -414,7 +412,7 @@
<v-textarea
v-model="inviteMessage"
color="orange"
bg-color="grey lighten-3"
bg-color="grey-lighten-3"
required
:placeholder="$t('UsabilityCooperators.placeholderMessage')"
variant="outlined"
Expand Down Expand Up @@ -488,7 +486,13 @@ const date = ref(
.toISOString()
.substr(0, 10)
);
const hour = ref(null);
const hour = ref(
new Date().toLocaleTimeString('en-GB', {
hour: '2-digit',
minute: '2-digit',
hour12: false
})
);
const headers = ref([
{ title: 'Email', value: 'email' },
{ title: 'Test Date', value: 'testDate' },
Expand All @@ -500,7 +504,7 @@ const headers = ref([
]);
const roleOptions = ref(roleOptionsItems);
const intro = ref(null);
const comboboxModel = ref({});
const comboboxModel = ref(null);
const comboboxKey = ref(0);
const selectedRole = ref(1);
const showCoops = ref(false);
Expand Down Expand Up @@ -564,12 +568,13 @@ const saveInvitation = async () => {
};

const verifyEmail = () => {
if (!comboboxModel.value || !comboboxModel.value?.email) return;
const alreadyInvited = cooperatorsEdit.value.find(
(cooperator) => cooperator.email === comboboxModel.value.email
(cooperator) => cooperator.email === comboboxModel.value?.email
);
if (alreadyInvited) {
toast.warning(`${comboboxModel.value.email} has already been invited`);
comboboxModel.value = {};
comboboxModel.value = null;
}
};

Expand All @@ -585,7 +590,7 @@ const submit = async () => {
inviteForm.value.resetValidation();
hour.value = null;
inviteMessage.value = '';
comboboxModel.value = {};
comboboxModel.value = null;
combobox.value.blur();
};

Expand Down
Loading