Merge pull request #1265 from pateljannat/issues-70

fix: jobs page rendering issue for guest users
frappe · Jan 22, 2025 · a28227a · a28227a
2 parents ed8baf3 + 1ac5de9
commit a28227a
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/frontend/src/components/ProgressBar.vue b/frontend/src/components/ProgressBar.vue
@@ -1,6 +1,6 @@
 <template>
 	<Tooltip :text="`${props.progress}%`">
-		<div class="w-full bg-gray-200 rounded-full h-1 my-2">
+		<div class="w-full bg-gray-200 rounded-full h-1">
 			<div
 				class="bg-gray-900 rounded-full"
 				:class="progressBarHeight"

diff --git a/frontend/src/components/Quiz.vue b/frontend/src/components/Quiz.vue
@@ -40,12 +40,14 @@
 			</div>
 		</div>
 
-		<div v-if="quiz.data.duration" class="flex items-center space-x-2 my-4">
-			<span class="text-gray-600 text-xs"> {{ __('Time') }}: </span>
+		<div v-if="quiz.data.duration" class="flex flex-col space-x-1 my-4">
+			<div class="mb-2">
+				<span class=""> {{ __('Time') }}: </span>
+				<span class="font-semibold">
+					{{ formatTimer(timer) }}
+				</span>
+			</div>
 			<ProgressBar :progress="timerProgress" />
-			<span class="font-semibold">
-				{{ formatTimer(timer) }}
-			</span>
 		</div>
 
 		<div v-if="activeQuestion == 0">
@@ -590,6 +592,7 @@ const getInstructions = (question) => {
 }
 
 const markLessonProgress = () => {
+	console.log(router)
 	if (router.currentRoute.value.name == 'Lesson') {
 		call('lms.lms.api.mark_lesson_progress', {
 			course: router.currentRoute.value.params.courseName,

diff --git a/frontend/src/pages/Jobs.vue b/frontend/src/pages/Jobs.vue
@@ -81,7 +81,7 @@
 	</div>
 </template>
 <script setup>
-import { Button, Breadcrumbs, createListResource, FormControl } from 'frappe-ui'
+import { Button, Breadcrumbs, createResource, FormControl } from 'frappe-ui'
 import { Plus, Search } from 'lucide-vue-next'
 import { inject, computed, ref, onMounted } from 'vue'
 import JobCard from '@/components/JobCard.vue'
@@ -101,32 +101,26 @@ onMounted(() => {
 	updateJobs()
 })
 
-const jobs = createListResource({
-	doctype: 'Job Opportunity',
-	fields: [
-		'name',
-		'job_title',
-		'company_name',
-		'company_logo',
-		'location',
-		'type',
-		'creation',
-	],
-	start: 0,
-	pageLength: 20,
-	cache: ['jobOpportunities'],
+const jobs = createResource({
+	url: 'lms.lms.api.get_job_opportunities',
+	cache: ['jobs'],
 })
 
 const updateJobs = () => {
 	updateFilters()
 	jobs.update({
-		filters: filters.value,
-		orFilters: orFilters.value,
+		params: {
+			filters: filters.value,
+			orFilters: orFilters.value,
+		},
 	})
 	jobs.reload()
 }
 
 const updateFilters = () => {
+	filters.value.status = 'Open'
+	filters.value.disabled = 0
+
 	if (jobType.value) {
 		filters.value.type = jobType.value
 	} else {

diff --git a/lms/lms/api.py b/lms/lms/api.py
@@ -267,11 +267,23 @@ def get_job_details(job):
 
 
 @frappe.whitelist(allow_guest=True)
-def get_job_opportunities():
+def get_job_opportunities(filters=None, orFilters=None):
+	if not filters:
+		filters = {}
+
 	jobs = frappe.get_all(
 		"Job Opportunity",
-		{"status": "Open", "disabled": False},
-		["job_title", "location", "type", "company_name", "company_logo", "name", "creation"],
+		filters=filters,
+		or_filters=orFilters,
+		fields=[
+			"job_title",
+			"location",
+			"type",
+			"company_name",
+			"company_logo",
+			"name",
+			"creation",
+		],
 		order_by="creation desc",
 	)
 	return jobs