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

chore: merged conflicts

Browse Source
This commit is contained in:
Jannat Patel
2024-12-30 18:21:47 +05:30
parent 7f768e81f4 068718aa8a
commit 156d36fb5e
18 changed files with 644 additions and 597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
frontend/src/components/BatchStudents.vue
View File

@@ -63,13 +63,13 @@
class="flex items-center justify-center text-sm text-gray-700 space-x-4"
>
<div class="flex items-center space-x-2">
<div class="w-3 h-3" style="background-color: #0289f7"></div>
<div class="w-3 h-3" style="background-color: #0f736b"></div>
<div>
{{ __('Courses') }}
</div>
</div>
<div class="flex items-center space-x-2">
<div class="w-3 h-3" style="background-color: #e03636"></div>
<div class="w-3 h-3" style="background-color: #0070cc"></div>
<div>
{{ __('Assessments') }}
</div>
@@ -352,8 +352,8 @@ const getChartData = () => {
}
const getChartOptions = (categories) => {
const courseColor = '#0289F7'
const assessmentColor = '#E03636'
const courseColor = '#0F736B'
const assessmentColor = '#0070CC'
const maxY =
students.data?.length % 5
? students.data?.length + (5 - (students.data?.length % 5))
@@ -362,7 +362,7 @@ const getChartOptions = (categories) => {
return {
chart: {
type: 'bar',
height: 350,
height: 50,
toolbar: {
show: false,
},
@@ -371,16 +371,13 @@ const getChartOptions = (categories) => {
bar: {
distributed: true,
borderRadius: 0,
horizontal: false,
columnWidth: '5%',
horizontal: true,
barHeight: '30%',
},
},
colors: Object.values(categories).map((item) =>
item.type === 'course' ? courseColor : assessmentColor
),
legends: {
show: false,
},
xaxis: {
categories: Object.values(categories).map((item) => item.label),
labels: {
@@ -388,6 +385,9 @@ const getChartOptions = (categories) => {
fontSize: '10px',
},
rotate: 0,
formatter: function (value) {
return value.length > 20 ? `${value.substring(0, 20)}...` : value // Trim long labels
},
},
},
yaxis: {

42
frontend/src/components/CourseCardOverlay.vue
View File

@@ -87,25 +87,29 @@
</span>
</Button>
</router-link>
<div class="mt-8 mb-4 font-medium">
{{ __('This course has:') }}
</div>
<div class="flex items-center mb-3">
<BookOpen class="h-5 w-5 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ course.data.lessons }} {{ __('Lessons') }}
</span>
</div>
<div class="flex items-center mb-3">
<Users class="h-5 w-5 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ formatAmount(course.data.enrollments) }}
{{ __('Enrolled Students') }}
</span>
</div>
<div class="flex items-center">
<Star class="h-5 w-5 stroke-1.5 fill-orange-500 text-gray-50" />
<span class="ml-2"> {{ course.data.rating }} {{ __('Rating') }} </span>
<div class="space-y-4">
<div class="mt-8 font-medium">
{{ __('This course has:') }}
</div>
<div class="flex items-center">
<BookOpen class="h-4 w-4 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ course.data.lessons }} {{ __('Lessons') }}
</span>
</div>
<div class="flex items-center">
<Users class="h-4 w-4 stroke-1.5 text-gray-600" />
<span class="ml-2">
{{ formatAmount(course.data.enrollments) }}
{{ __('Enrolled Students') }}
</span>
</div>
<div v-if="parseInt(course.data.rating) > 0" class="flex items-center">
<Star class="h-4 w-4 stroke-1.5 fill-orange-500 text-gray-50" />
<span class="ml-2">
{{ course.data.rating }} {{ __('Rating') }}
</span>
</div>
</div>
</div>
</div>