eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1494 from pateljannat/issues-104

Browse Source 
fix: misc issues
This commit is contained in:
Jannat Patel
2025-05-08 16:01:14 +05:30
committed by GitHub
parent d54ac37403 159b651871
commit 12e5eedd6b
5 changed files with 114 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/components/Modals/EvaluationModal.vue
View File

@@ -42,10 +42,11 @@
<div class="grid grid-cols-2 gap-2"> <div class="grid grid-cols-2 gap-2">
<div v-for="slot in slots.data"> <div v-for="slot in slots.data">
<div <div
class="text-base text-center border rounded-md bg-surface-gray-3 p-2 cursor-pointer" class="text-base text-center border rounded-md text-ink-gray-8 bg-surface-gray-3 p-2 cursor-pointer"
@click="saveSlot(slot)" @click="saveSlot(slot)"
:class="{ :class="{
'border-gray-900': evaluation.start_time == slot.start_time, 'border-outline-gray-4':
evaluation.start_time == slot.start_time,
}" }"
> >
{{ formatTime(slot.start_time) }} - {{ formatTime(slot.start_time) }} -

19
frontend/src/components/UpcomingEvaluations.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<div class="flex items-center justify-between mb-4"> <div class="flex items-center justify-between mb-4">
<div class="text-lg font-semibold"> <div class="text-lg text-ink-gray-9 font-semibold">
{{ __('Upcoming Evaluations') }} {{ __('Upcoming Evaluations') }}
</div> </div>
<Button <Button
@@ -17,9 +17,9 @@
<div v-if="upcoming_evals.data?.length"> <div v-if="upcoming_evals.data?.length">
<div class="grid grid-cols-3 gap-4"> <div class="grid grid-cols-3 gap-4">
<div v-for="evl in upcoming_evals.data"> <div v-for="evl in upcoming_evals.data">
<div class="border rounded-md p-3"> <div class="border text-ink-gray-7 rounded-md p-3">
<div class="flex justify-between mb-3"> <div class="flex justify-between mb-3">
<span class="font-semibold leading-5"> <span class="font-semibold text-ink-gray-9 leading-5">
{{ evl.course_title }} {{ evl.course_title }}
</span> </span>
<Menu <Menu
@@ -42,7 +42,7 @@
leave-to-class="transform scale-95 opacity-0" leave-to-class="transform scale-95 opacity-0"
> >
<MenuItems <MenuItems
class="absolute mt-2 w-32 rounded-md bg-white shadow-lg p-1.5" class="absolute mt-2 w-32 rounded-md bg-surface-white border p-1.5"
> >
<MenuItem v-slot="{ active }"> <MenuItem v-slot="{ active }">
<Button <Button
@@ -82,12 +82,11 @@
{{ evl.evaluator_name }} {{ evl.evaluator_name }}
</span> </span>
</div> </div>
<div class="flex items-center justify-between space-x-2 mt-4"> <div
<Button v-if="evl.google_meet_link"
v-if="evl.google_meet_link" class="flex items-center justify-between space-x-2 mt-4"
@click="openEvalCall(evl)" >
class="w-full" <Button @click="openEvalCall(evl)" class="w-full">
>
<template #prefix> <template #prefix>
<HeadsetIcon class="w-4 h-4 stroke-1.5" /> <HeadsetIcon class="w-4 h-4 stroke-1.5" />
</template> </template>

125
frontend/src/pages/JobDetail.vue
View File

@@ -67,86 +67,61 @@
</header> </header>
<div v-if="job.data" class="max-w-3xl mx-auto pt-5"> <div v-if="job.data" class="max-w-3xl mx-auto pt-5">
<div class="p-4"> <div class="p-4">
<div class="space-y-5 mb-10"> <div class="space-y-5 mb-12">
<div class="flex items-center"> <div class="flex">
<img <img
:src="job.data.company_logo" :src="job.data.company_logo"
class="size-10 rounded-lg object-contain cursor-pointer mr-4" class="size-10 rounded-lg object-contain cursor-pointer mr-4"
:alt="job.data.company_name" :alt="job.data.company_name"
@click="redirectToWebsite(job.data.company_website)" @click="redirectToWebsite(job.data.company_website)"
/> />
<div class="text-2xl text-ink-gray-9 font-semibold"> <div class="">
{{ job.data.job_title }} <div class="text-2xl text-ink-gray-9 font-semibold mb-1">
{{ job.data.job_title }}
</div>
<div class="text-sm text-ink-gray-5 font-semibold">
{{ job.data.company_name }} - {{ job.data.location }},
{{ job.data.country }}
</div>
</div> </div>
</div> </div>
<div>
<div <div class="space-x-5">
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-5 md:gap-y-5" <Badge size="lg">
> <template #prefix>
<div class="flex items-center space-x-4"> <CalendarDays class="size-3 stroke-2 text-ink-gray-7" />
<Building2 class="size-4 stroke-1.5 text-ink-gray-7" /> </template>
<div class="flex flex-col space-y-1 text-ink-gray-7"> {{ dayjs(job.data.creation).fromNow() }}
<span class="text-xs text-ink-gray-5 font-medium uppercase"> </Badge>
{{ __('Organisation') }} <Badge size="lg">
</span> <template #prefix>
<span class="text-sm font-semibold"> <SquareUserRound class="size-3 stroke-2 text-ink-gray-7" />
{{ job.data.company_name }} </template>
</span> {{ applicationCount.data }}
</div> {{
</div> applicationCount.data == 1 ? __('applicant') : __('applicants')
<div class="flex items-center space-x-4"> }}
<MapPin class="size-4 stroke-1.5 text-ink-gray-7" /> </Badge>
<div class="flex flex-col space-y-1 text-ink-gray-7"> <Badge size="lg">
<span class="text-xs text-ink-gray-5 font-medium uppercase"> <template #prefix>
{{ __('Location') }} <ClipboardType class="size-3 stroke-2 text-ink-gray-7" />
</span> </template>
<span class="text-sm font-semibold"> {{ job.data.type }}
{{ job.data.location }}, {{ job.data.country }} </Badge>
</span>
</div>
</div>
<div class="flex items-center space-x-4">
<ClipboardType class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Category') }}
</span>
<span class="text-sm font-semibold">
{{ job.data.type }}
</span>
</div>
</div>
<div class="flex items-center space-x-4">
<CalendarDays class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Posted on') }}
</span>
<span class="text-sm font-semibold">
{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
</span>
</div>
</div>
<div
v-if="applicationCount.data"
class="flex items-center space-x-4"
>
<SquareUserRound class="size-4 stroke-1.5 text-ink-gray-7" />
<div class="flex flex-col space-y-1 text-ink-gray-7">
<span class="text-xs text-ink-gray-5 font-medium uppercase">
{{ __('Applications Received') }}
</span>
<span class="text-sm font-semibold">
{{ applicationCount.data }}
</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="flex items-center justify-between">
<div class="bg-surface-gray-2 h-px m-1 w-1/2"></div>
<div>
<FileText class="size-3 stroke-1 text-ink-gray-5" />
</div>
<div class="bg-surface-gray-2 h-px m-1 w-1/2"></div>
</div>
<p <p
v-html="job.data.description" v-html="job.data.description"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-6" class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal mt-12"
></p> ></p>
</div> </div>
<JobApplicationModal <JobApplicationModal
@@ -169,15 +144,14 @@ import { inject, ref } from 'vue'
import { sessionStore } from '../stores/session' import { sessionStore } from '../stores/session'
import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue' import JobApplicationModal from '@/components/Modals/JobApplicationModal.vue'
import { import {
MapPin,
Check, Check,
SendHorizonal, SendHorizonal,
Pencil, Pencil,
Building2,
CalendarDays, CalendarDays,
ClipboardType,
SquareUserRound, SquareUserRound,
SquareArrowOutUpRight, SquareArrowOutUpRight,
FileText,
ClipboardType,
} from 'lucide-vue-next' } from 'lucide-vue-next'
const user = inject('$user') const user = inject('$user')
@@ -252,3 +226,12 @@ usePageMeta(() => {
} }
}) })
</script> </script>
<style>
p {
margin-bottom: 0.5rem !important;
line-height: 1.5;
}
p span {
line-height: 1.5;
}
</style>

69
frontend/src/pages/Statistics.vue
View File

@@ -7,35 +7,45 @@
</header> </header>
<div v-if="chartDetails.data" class="p-5"> <div v-if="chartDetails.data" class="p-5">
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4"> <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-5 gap-4">
<NumberChart <Tooltip :text="__('Published Courses')">
class="border rounded-md" <NumberChart
:config="{ title: 'Courses', value: chartDetails.data.courses }" class="border rounded-md"
/> :config="{ title: 'Courses', value: chartDetails.data.courses }"
<NumberChart />
class="border rounded-md" </Tooltip>
:config="{ title: 'Signups', value: chartDetails.data.users }" <Tooltip :text="__('Active Members')">
/> <NumberChart
<NumberChart class="border rounded-md"
class="border rounded-md" :config="{ title: 'Signups', value: chartDetails.data.users }"
:config="{ />
title: 'Enrollments', </Tooltip>
value: chartDetails.data.enrollments, <Tooltip :text="__('Course Enrollments')">
}" <NumberChart
/> class="border rounded-md"
<NumberChart :config="{
class="border rounded-md" title: 'Enrollments',
:config="{ value: chartDetails.data.enrollments,
title: 'Completions', }"
value: chartDetails.data.completions, />
}" </Tooltip>
/> <Tooltip :text="__('Course Completions')">
<NumberChart <NumberChart
class="border rounded-md" class="border rounded-md"
:config="{ :config="{
title: 'Certifications', title: 'Completions',
value: chartDetails.data.certifications, value: chartDetails.data.completions,
}" }"
/> />
</Tooltip>
<Tooltip :text="__('Certified Members')">
<NumberChart
class="border rounded-md"
:config="{
title: 'Certifications',
value: chartDetails.data.certifications,
}"
/>
</Tooltip>
</div> </div>
<div class="grid grid-cols-1 lg:grid-cols-2 gap-4 mt-4"> <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 mt-4">
<div class="border rounded-md min-h-72"> <div class="border rounded-md min-h-72">
@@ -129,6 +139,7 @@ import {
createResource, createResource,
DonutChart, DonutChart,
NumberChart, NumberChart,
Tooltip,
usePageMeta, usePageMeta,
} from 'frappe-ui' } from 'frappe-ui'
import { computed } from 'vue' import { computed } from 'vue'

13
lms/lms/utils.py
View File

@@ -772,14 +772,17 @@ def get_chart_data(
from_date = add_months(getdate(), -1) from_date = add_months(getdate(), -1)
if not to_date: if not to_date:
to_date = getdate() to_date = getdate()
chart = frappe.get_doc("Dashboard Chart", chart_name)
filters = [([chart.document_type, "docstatus", "<", 2, False])]
doctype = chart.document_type
datefield = chart.based_on
value_field = chart.value_based_on or "1"
from_date = get_datetime(from_date).strftime("%Y-%m-%d") from_date = get_datetime(from_date).strftime("%Y-%m-%d")
to_date = get_datetime(to_date) to_date = get_datetime(to_date)
chart = frappe.get_doc("Dashboard Chart", chart_name)
doctype = chart.document_type
datefield = chart.based_on
value_field = chart.value_based_on or "1"
filters = [([chart.document_type, "docstatus", "<", 2, False])]
filters = filters + json.loads(chart.filters_json)
filters.append([doctype, datefield, ">=", from_date, False]) filters.append([doctype, datefield, ">=", from_date, False])
filters.append([doctype, datefield, "<=", to_date, False]) filters.append([doctype, datefield, "<=", to_date, False])