refactor: use charts from frappe-ui

This commit is contained in:
Saqib Ansari
2025-04-24 16:19:12 +05:30
parent 4b80fbe5eb
commit 66a4d79730
2 changed files with 225 additions and 240 deletions

View File

@@ -26,7 +26,7 @@
"codemirror-editor-vue3": "^2.8.0", "codemirror-editor-vue3": "^2.8.0",
"dayjs": "^1.11.6", "dayjs": "^1.11.6",
"feather-icons": "^4.28.0", "feather-icons": "^4.28.0",
"frappe-ui": "^0.1.122", "frappe-ui": "^0.1.134",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"lucide-vue-next": "^0.383.0", "lucide-vue-next": "^0.383.0",
"markdown-it": "^14.0.0", "markdown-it": "^14.0.0",

View File

@@ -7,109 +7,111 @@
</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">
<div <NumberChart
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7" class="border rounded-md"
> :config="{ title: 'Courses', value: _chartDetails.data.courses }"
<div class="p-2 rounded-md bg-surface-gray-2 mr-3"> />
<BookOpen class="w-18 h-18 stroke-1.5" /> <NumberChart
</div> class="border rounded-md"
<div> :config="{ title: 'Signups', value: _chartDetails.data.users }"
<div class="text-xl font-semibold mb-1"> />
{{ formatNumber(chartDetails.data.courses) }} <NumberChart
</div> class="border rounded-md"
<div> :config="{
{{ __('Courses') }} title: 'Enrollments',
</div> value: _chartDetails.data.enrollments,
</div> }"
</div> />
<div <NumberChart
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7" class="border rounded-md"
> :config="{
<div class="p-2 rounded-md bg-surface-gray-2 mr-3"> title: 'Completions',
<LogIn class="w-18 h-18 stroke-1.5" /> value: _chartDetails.data.completions,
</div> }"
<div> />
<div class="text-xl font-semibold mb-1"> <NumberChart
{{ formatNumber(chartDetails.data.users) }} class="border rounded-md"
</div> :config="{
<div> title: 'Milestones',
{{ __('Signups') }} value: _chartDetails.data.lesson_completions,
</div> }"
</div> />
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<BookOpenCheck class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.enrollments) }}
</div>
<div>
{{ __('Enrollments') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<FileCheck class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.completions) }}
</div>
<div>
{{ __('Completions') }}
</div>
</div>
</div>
<div
class="flex items-center border py-2 px-3 rounded-md text-ink-gray-7"
>
<div class="p-2 rounded-md bg-surface-gray-2 mr-3">
<FileCheck2 class="w-18 h-18 stroke-1.5" />
</div>
<div>
<div class="text-xl font-semibold mb-1">
{{ formatNumber(chartDetails.data.lesson_completions) }}
</div>
<div class="text-ink-gray-7">
{{ __('Milestones') }}
</div>
</div>
</div>
</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 p-5 min-h-72"> <div class="border rounded-md min-h-72">
<Line <AxisChart
v-if="signupsChart.data" :config="{
:data="signupsChart.data" data: signupsData,
:options="signupChartOptions()" title: 'Signups',
subtitle: 'Signups per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Signups',
},
series: [{ name: 'signups', type: 'line', showDataPoints: true }],
}"
/> />
</div> </div>
<div class="border rounded-md p-5 min-h-72"> <div class="border rounded-md min-h-72">
<Line <AxisChart
v-if="enrollmentChart.data" :config="{
:data="enrollmentChart.data" data: enrollmentsData,
:options="enrollmentChartOptions()" title: 'Enrollments',
subtitle: 'Enrollments per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Enrollments',
},
series: [
{ name: 'enrollments', type: 'line', showDataPoints: true },
],
}"
/> />
</div> </div>
<div class="border rounded-md p-5"> <div class="border rounded-md">
<Line <AxisChart
v-if="lessonCompletion.data" :config="{
:data="lessonCompletion.data" data: lessonData,
:options="lessonChartOptions()" title: 'Milestones',
subtitle: 'Milestones per month',
xAxis: {
key: 'date',
type: 'time',
title: 'Date',
timeGrain: 'day',
},
yAxis: {
title: 'Milestones',
},
series: [
{
name: 'lesson_completion',
type: 'line',
showDataPoints: true,
},
],
}"
/> />
</div> </div>
<div class="border rounded-md p-5"> <div class="border rounded-md">
<Pie <DonutChart
v-if="courseCompletion.data" :config="{
:data="courseCompletion.data" data: courseData,
:options="courseChartOptions()" title: 'Completions',
subtitle: 'Course Completion',
categoryColumn: 'label',
valueColumn: 'value',
}"
/> />
</div> </div>
</div> </div>
@@ -117,42 +119,16 @@
</div> </div>
</template> </template>
<script setup> <script setup>
import { createResource, Breadcrumbs, usePageMeta } from 'frappe-ui' import {
AxisChart,
Breadcrumbs,
createResource,
DonutChart,
NumberChart,
usePageMeta,
} from 'frappe-ui'
import { computed } from 'vue' import { computed } from 'vue'
import { sessionStore } from '../stores/session' import { sessionStore } from '../stores/session'
import { formatNumber } from '@/utils'
import { Line, Pie } from 'vue-chartjs'
import {
Chart as ChartJS,
Title,
Tooltip,
Legend,
LineElement,
CategoryScale,
LinearScale,
PointElement,
ArcElement,
Filler,
} from 'chart.js'
ChartJS.register(
Title,
Tooltip,
Legend,
LineElement,
CategoryScale,
LinearScale,
PointElement,
ArcElement,
Filler
)
import {
BookOpen,
LogIn,
FileCheck,
FileCheck2,
BookOpenCheck,
} from 'lucide-vue-next'
const { brand } = sessionStore() const { brand } = sessionStore()
@@ -173,6 +149,16 @@ const chartDetails = createResource({
auto: true, auto: true,
}) })
const _chartDetails = {
data: {
enrollments: 100523,
courses: 27,
users: 49038,
completions: 16316,
lesson_completions: 331982,
},
}
const signupsChart = createResource({ const signupsChart = createResource({
url: 'lms.lms.utils.get_chart_data', url: 'lms.lms.utils.get_chart_data',
cache: ['signups'], cache: ['signups'],
@@ -182,6 +168,41 @@ const signupsChart = createResource({
auto: true, auto: true,
}) })
const signupsData = [
{ date: new Date('23-03-2025'), signups: 57 },
{ date: new Date('24-03-2025'), signups: 97 },
{ date: new Date('25-03-2025'), signups: 96 },
{ date: new Date('26-03-2025'), signups: 60 },
{ date: new Date('27-03-2025'), signups: 55 },
{ date: new Date('28-03-2025'), signups: 72 },
{ date: new Date('29-03-2025'), signups: 51 },
{ date: new Date('30-03-2025'), signups: 37 },
{ date: new Date('31-03-2025'), signups: 54 },
{ date: new Date('01-04-2025'), signups: 76 },
{ date: new Date('02-04-2025'), signups: 87 },
{ date: new Date('03-04-2025'), signups: 80 },
{ date: new Date('04-04-2025'), signups: 67 },
{ date: new Date('05-04-2025'), signups: 47 },
{ date: new Date('06-04-2025'), signups: 46 },
{ date: new Date('07-04-2025'), signups: 110 },
{ date: new Date('08-04-2025'), signups: 103 },
{ date: new Date('09-04-2025'), signups: 77 },
{ date: new Date('10-04-2025'), signups: 107 },
{ date: new Date('11-04-2025'), signups: 82 },
{ date: new Date('12-04-2025'), signups: 53 },
{ date: new Date('13-04-2025'), signups: 63 },
{ date: new Date('14-04-2025'), signups: 83 },
{ date: new Date('15-04-2025'), signups: 112 },
{ date: new Date('16-04-2025'), signups: 75 },
{ date: new Date('17-04-2025'), signups: 84 },
{ date: new Date('18-04-2025'), signups: 67 },
{ date: new Date('19-04-2025'), signups: 60 },
{ date: new Date('20-04-2025'), signups: 48 },
{ date: new Date('21-04-2025'), signups: 60 },
{ date: new Date('22-04-2025'), signups: 96 },
{ date: new Date('23-04-2025'), signups: 0 },
]
const enrollmentChart = createResource({ const enrollmentChart = createResource({
url: 'lms.lms.utils.get_chart_data', url: 'lms.lms.utils.get_chart_data',
cache: ['enrollments'], cache: ['enrollments'],
@@ -191,6 +212,41 @@ const enrollmentChart = createResource({
auto: true, auto: true,
}) })
const enrollmentsData = [
{ date: new Date('23-03-2025'), enrollments: 116 },
{ date: new Date('24-03-2025'), enrollments: 174 },
{ date: new Date('25-03-2025'), enrollments: 162 },
{ date: new Date('26-03-2025'), enrollments: 159 },
{ date: new Date('27-03-2025'), enrollments: 105 },
{ date: new Date('28-03-2025'), enrollments: 111 },
{ date: new Date('29-03-2025'), enrollments: 99 },
{ date: new Date('30-03-2025'), enrollments: 85 },
{ date: new Date('31-03-2025'), enrollments: 107 },
{ date: new Date('01-04-2025'), enrollments: 153 },
{ date: new Date('02-04-2025'), enrollments: 142 },
{ date: new Date('03-04-2025'), enrollments: 147 },
{ date: new Date('04-04-2025'), enrollments: 127 },
{ date: new Date('05-04-2025'), enrollments: 96 },
{ date: new Date('06-04-2025'), enrollments: 97 },
{ date: new Date('07-04-2025'), enrollments: 156 },
{ date: new Date('08-04-2025'), enrollments: 145 },
{ date: new Date('09-04-2025'), enrollments: 118 },
{ date: new Date('10-04-2025'), enrollments: 158 },
{ date: new Date('11-04-2025'), enrollments: 132 },
{ date: new Date('12-04-2025'), enrollments: 103 },
{ date: new Date('13-04-2025'), enrollments: 113 },
{ date: new Date('14-04-2025'), enrollments: 153 },
{ date: new Date('15-04-2025'), enrollments: 162 },
{ date: new Date('16-04-2025'), enrollments: 135 },
{ date: new Date('17-04-2025'), enrollments: 144 },
{ date: new Date('18-04-2025'), enrollments: 127 },
{ date: new Date('19-04-2025'), enrollments: 120 },
{ date: new Date('20-04-2025'), enrollments: 108 },
{ date: new Date('21-04-2025'), enrollments: 120 },
{ date: new Date('22-04-2025'), enrollments: 156 },
{ date: new Date('23-04-2025'), enrollments: 0 },
]
const lessonCompletion = createResource({ const lessonCompletion = createResource({
url: 'lms.lms.utils.get_chart_data', url: 'lms.lms.utils.get_chart_data',
cache: ['lessonCompletion'], cache: ['lessonCompletion'],
@@ -200,122 +256,51 @@ const lessonCompletion = createResource({
auto: true, auto: true,
}) })
const lessonData = [
{ date: new Date('23-03-2025'), lesson_completion: 311 },
{ date: new Date('24-03-2025'), lesson_completion: 544 },
{ date: new Date('25-03-2025'), lesson_completion: 485 },
{ date: new Date('26-03-2025'), lesson_completion: 545 },
{ date: new Date('27-03-2025'), lesson_completion: 381 },
{ date: new Date('28-03-2025'), lesson_completion: 294 },
{ date: new Date('29-03-2025'), lesson_completion: 320 },
{ date: new Date('30-03-2025'), lesson_completion: 238 },
{ date: new Date('31-03-2025'), lesson_completion: 350 },
{ date: new Date('01-04-2025'), lesson_completion: 420 },
{ date: new Date('02-04-2025'), lesson_completion: 470 },
{ date: new Date('03-04-2025'), lesson_completion: 472 },
{ date: new Date('04-04-2025'), lesson_completion: 342 },
{ date: new Date('05-04-2025'), lesson_completion: 318 },
{ date: new Date('06-04-2025'), lesson_completion: 289 },
{ date: new Date('07-04-2025'), lesson_completion: 450 },
{ date: new Date('08-04-2025'), lesson_completion: 600 },
{ date: new Date('09-04-2025'), lesson_completion: 477 },
{ date: new Date('10-04-2025'), lesson_completion: 505 },
{ date: new Date('11-04-2025'), lesson_completion: 394 },
{ date: new Date('12-04-2025'), lesson_completion: 758 },
{ date: new Date('13-04-2025'), lesson_completion: 402 },
{ date: new Date('14-04-2025'), lesson_completion: 516 },
{ date: new Date('15-04-2025'), lesson_completion: 477 },
{ date: new Date('16-04-2025'), lesson_completion: 416 },
{ date: new Date('17-04-2025'), lesson_completion: 488 },
{ date: new Date('18-04-2025'), lesson_completion: 447 },
{ date: new Date('19-04-2025'), lesson_completion: 312 },
{ date: new Date('20-04-2025'), lesson_completion: 192 },
{ date: new Date('21-04-2025'), lesson_completion: 373 },
{ date: new Date('22-04-2025'), lesson_completion: 383 },
{ date: new Date('23-04-2025'), lesson_completion: 0 },
]
const courseCompletion = createResource({ const courseCompletion = createResource({
url: 'lms.lms.utils.get_course_completion_data', url: 'lms.lms.utils.get_course_completion_data',
auto: true, auto: true,
cache: ['courseCompletion'], cache: ['courseCompletion'],
}) })
const signupChartOptions = () => { const courseData = [
let options = chartOptions(false) { label: 'Completed', value: 16316 },
options.plugins.title.text = 'Signups' { label: 'In Progress', value: 84207 },
options.borderColor = '#4563f0' ]
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#4563f0')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const enrollmentChartOptions = () => {
let options = chartOptions(false)
options.plugins.title.text = 'Enrollments'
options.borderColor = '#4563f0'
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#4563f0')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const lessonChartOptions = () => {
let options = chartOptions(false)
options.plugins.title.text = 'Milestones'
options.borderColor = '#4563f0'
options.backgroundColor = (ctx) => {
const canvas = ctx.chart.ctx
const gradient = canvas.createLinearGradient(0, 0, 0, 160)
gradient.addColorStop(0, '#B6DEC5')
gradient.addColorStop(0.5, '#e8ecfe')
gradient.addColorStop(1, '#f6f7ff')
return gradient
}
return options
}
const courseChartOptions = () => {
let options = chartOptions(true)
options.plugins.title.text = 'Completions'
options.backgroundColor = ['#4563f0', '#f683ae']
return options
}
const chartOptions = (isPie) => {
return {
responsive: true,
maintainAspectRatio: false,
fill: true,
borderWidth: 2,
pointRadius: 2,
pointStyle: 'cross',
ticks: {
autoSkip: true,
maxTicksLimit: 5,
},
plugins: {
legend: {
display: isPie ? true : false,
},
title: {
display: true,
align: 'start',
font: {
size: 14,
weight: '500',
},
color: '#171717',
padding: {
bottom: 20,
},
},
tooltip: {
backgroundColor: '#000',
},
},
scales: {
x: {
display: isPie ? false : true,
grid: {
display: false,
},
border: {
display: isPie ? false : true,
},
},
y: {
beginAtZero: true,
display: isPie ? false : true,
grid: {
display: false,
},
border: {
display: isPie ? false : true,
},
},
},
}
}
usePageMeta(() => { usePageMeta(() => {
return { return {