MIDNIGHT/enlight-lms
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: resolved merge conflicts

Browse Source
This commit is contained in:
Jannat Patel
2026-01-13 12:18:30 +05:30
parent 45e98b9ddc 65b18641b5
commit 8ad5288226
17 changed files with 722 additions and 673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/components/Controls/MultiSelect.vue
View File

@@ -19,6 +19,14 @@
showOptions = true
}
"
@focus="
() => {
showOptions = true
if (!filterOptions.data || filterOptions.data.length === 0) {
reload('')
}
}
"
autocomplete="off"
/>
</template>
@@ -152,9 +160,6 @@ const selectedValue = computed({
get: () => query.value || '',
set: (val) => {
query.value = ''
if (val) {
showOptions.value = false
}
val?.value && addValue(val.value)
},
})
@@ -183,7 +188,8 @@ const filterOptions = createResource({
const options = computed(() => {
setFocus()
return filterOptions.data || []
const allOptions = filterOptions.data || []
return allOptions.filter((option) => !values.value?.includes(option.value))
})
function reload(val) {

67
frontend/src/pages/CertifiedParticipants.vue
View File

@@ -15,7 +15,7 @@
<div class="mx-auto w-full max-w-4xl pt-6 pb-10">
<div class="flex flex-col md:flex-row justify-between mb-8 px-3">
<div class="text-xl font-semibold text-ink-gray-9 mb-4 md:mb-0">
{{ memberCount }} {{ __('certified members') }}
{{ memberCount }} {{ __('Certified Members') }}
</div>
<div
class="flex flex-col md:flex-row md:items-center space-y-4 md:space-y-0 md:space-x-4"
@@ -65,42 +65,43 @@
username: participant.username,
},
}"
class="flex rounded-md hover:bg-surface-gray-2 px-3"
>
<div
class="flex w-full space-x-3 py-2"
:class="{
'border-b': index < participants.data.length - 1,
}"
>
<UserAvatar :user="participant" size="2xl" />
<div class="rounded-md hover:bg-surface-gray-2 px-3">
<div
class="flex items-center w-full space-x-3 py-2"
:class="{
'border-b': index < participants.data.length - 1,
}"
>
<UserAvatar :user="participant" size="2xl" />
<div class="flex flex-col md:flex-row w-full">
<div class="flex-1">
<div class="text-base font-medium text-ink-gray-8">
{{ participant.full_name }}
<div class="flex flex-col md:flex-row w-full">
<div class="flex-1">
<div class="text-base font-medium text-ink-gray-8">
{{ participant.full_name }}
</div>
<div
v-if="participant.headline"
class="mt-1.5 text-base text-ink-gray-5"
>
{{ participant.headline }}
</div>
</div>
<div
v-if="participant.headline"
class="mt-1.5 text-base text-ink-gray-5"
class="flex items-center space-x-3 md:space-x-24 text-sm md:text-base mt-1.5"
>
{{ participant.headline }}
</div>
</div>
<div
class="flex items-center space-x-3 md:space-x-24 text-sm md:text-base mt-1.5"
>
<div class="text-ink-gray-5">
{{ participant.certificate_count }}
{{
participant.certificate_count > 1
? __('certificates')
: __('certificate')
}}
</div>
<span class="text-ink-gray-4 md:hidden">·</span>
<div class="text-ink-gray-5">
{{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
<div class="text-ink-gray-5">
{{ participant.certificate_count }}
{{
participant.certificate_count > 1
? __('certificates')
: __('certificate')
}}
</div>
<span class="text-ink-gray-4 md:hidden">·</span>
<div class="text-ink-gray-5">
{{ dayjs(participant.issue_date).format('DD MMM YYYY') }}
</div>
</div>
</div>
</div>
@@ -190,7 +191,7 @@ const updateParticipants = () => {
const updateFilters = () => {
filters.value = {
...(currentCategory.value && {
...(currentCategory.value.trim('') && {
category: currentCategory.value,
}),
...(nameFilter.value && {

7
frontend/src/pages/Quizzes.vue
View File

@@ -112,7 +112,12 @@
}"
>
<template #body-content>
<FormControl v-model="title" :label="__('Title')" type="text" @keydown.enter="insertQuiz(() => showForm = false)" />
<FormControl
v-model="title"
:label="__('Title')"
type="text"
@keydown.enter="insertQuiz(() => (showForm = false))"
/>
</template>
</Dialog>
</template>