Merge pull request #1232 from pateljannat/issues-63

fix: misc issues

frontend/src/pages/Badge.vue

@@ -1,30 +1,30 @@
 <template>
-	<div v-if="badge.doc">
+	<div v-if="badge.data">
 		<div class="p-5 flex flex-col items-center mt-40">
 			<div class="text-3xl font-semibold">
-				{{ badge.doc.badge }}
+				{{ badge.data.badge }}
 			</div>
 			<img
-				:src="badge.doc.badge_image"
+				:src="badge.data.badge_image"
-				:alt="badge.doc.badge"
+				:alt="badge.data.badge"
 				class="h-60 mt-2"
 			/>
-			<div class="text-lg">
+			<div class="">
 				{{
 					__('This badge has been awarded to {0} on {1}.').format(
-						badge.doc.member_name,
+						badge.data.member_name,
-						dayjs(badge.doc.issued_on).format('DD MMM YYYY')
+						dayjs(badge.data.issued_on).format('DD MMM YYYY')
 					)
 				}}
 			</div>
-			<div class="text-lg mt-2">
+			<div class="mt-2">
-				{{ badge.doc.badge_description }}
+				{{ badge.data.badge_description }}
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { createDocumentResource } from 'frappe-ui'
+import { createDocumentResource, createResource } from 'frappe-ui'
 import { computed, inject } from 'vue'
 
 const dayjs = inject('$dayjs')
@@ -40,12 +40,18 @@ const props = defineProps({
 	},
 })
 
-const badge = createDocumentResource({
+const badge = createResource({
+	url: 'frappe.client.get',
+	makeParams(values) {
+		return {
 			doctype: 'LMS Badge Assignment',
 			filters: {
 				badge: props.badgeName,
 				member: props.email,
 			},
+		}
+	},
+	auto: true,
 })
 
 const breadcrumbs = computed(() => {
@@ -54,11 +60,11 @@ const breadcrumbs = computed(() => {
 			label: 'Badges',
 		},
 		{
-			label: badge.doc.badge,
+			label: badge.data.badge,
 			route: {
 				name: 'Badge',
 				params: {
-					badge: badge.doc.badge,
+					badge: badge.data.badge,
 				},
 			},
 		},

lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.js

@@ -10,5 +10,11 @@ frappe.ui.form.on("LMS Badge Assignment", {
 				},
 			};
 		});
+
+		if (frm.doc.name)
+			frm.add_web_link(
+				`/badges/${frm.doc.badge}/${frm.doc.member}`,
+				"See on Website"
+			);
 	},
 });

lms/lms/utils.py

@@ -1239,6 +1239,7 @@ def get_batch_card_details(batchname):
 			"amount_usd",
 			"currency",
 			"start_date",
+			"end_date",
 			"start_time",
 			"end_time",
 			"timezone",