Merge pull request #1824 from pateljannat/issues-145

fix: roles, permission and access on profile page

frontend/src/components/Modals/Event.vue

@@ -66,7 +66,11 @@
 							</template>
 							{{ __('View Certificate') }}
 						</Button>
-						<Button v-else @click="openCallLink(event.venue)" class="w-full">
+						<Button
+							v-else-if="userIsEvaluator()"
+							@click="openCallLink(event.venue)"
+							class="w-full"
+						>
 							<template #prefix>
 								<Video class="h-4 w-4 stroke-1.5" />
 							</template>
@@ -83,21 +87,31 @@
 							class="flex flex-col space-y-4 p-5"
 						>
 							<div class="flex items-center justify-between">
-								<Rating v-model="evaluation.rating" :label="__('Rating')" />
+								<Rating
+									v-model="evaluation.rating"
+									:label="__('Rating')"
+									:disabled="!userIsEvaluator()"
+								/>
 								<FormControl
 									type="select"
 									:options="statusOptions"
 									v-model="evaluation.status"
 									:label="__('Status')"
 									class="w-1/2"
+									:disabled="!userIsEvaluator()"
 								/>
 							</div>
 							<Textarea
 								v-model="evaluation.summary"
 								:label="__('Summary')"
 								:rows="7"
+								:disabled="!userIsEvaluator()"
 							/>
-							<Button variant="solid" @click="saveEvaluation()">
+							<Button
+								v-if="userIsEvaluator()"
+								variant="solid"
+								@click="saveEvaluation()"
+							>
 								{{ __('Save') }}
 							</Button>
 						</div>
@@ -106,11 +120,13 @@
 								type="checkbox"
 								v-model="certificate.published"
 								:label="__('Published')"
+								:disabled="!userIsEvaluator()"
 							/>
 							<Link
 								v-model="certificate.template"
 								:label="__('Template')"
 								doctype="Print Format"
+								:disabled="!userIsEvaluator()"
 								:filters="{
 									doc_type: 'LMS Certificate',
 								}"
@@ -118,14 +134,20 @@
 							<FormControl
 								type="date"
 								v-model="certificate.issue_date"
+								:disabled="!userIsEvaluator()"
 								:label="__('Issue Date')"
 							/>
 							<FormControl
 								type="date"
 								v-model="certificate.expiry_date"
+								:disabled="!userIsEvaluator()"
 								:label="__('Expiry Date')"
 							/>
-							<Button variant="solid" @click="saveCertificate()">
+							<Button
+								v-if="userIsEvaluator()"
+								variant="solid"
+								@click="saveCertificate()"
+							>
 								{{ __('Save') }}
 							</Button>
 						</div>
@@ -163,6 +185,7 @@ import Rating from '@/components/Controls/Rating.vue'
 import Link from '@/components/Controls/Link.vue'
 
 const show = defineModel()
+const user = inject('$user')
 const dayjs = inject('$dayjs')
 const tabIndex = ref(0)
 const showCertification = ref(false)
@@ -175,9 +198,18 @@ const props = defineProps({
 })
 
 const evaluation = reactive({})
-
 const certificate = reactive({})
 
+watch(user, () => {
+	if (userIsEvaluator()) {
+		defaultTemplate.reload()
+	}
+})
+
+const userIsEvaluator = () => {
+	return user.data && user.data.name == props.event.evaluator
+}
+
 const defaultTemplate = createResource({
 	url: 'frappe.client.get_value',
 	makeParams(values) {
@@ -190,7 +222,6 @@ const defaultTemplate = createResource({
 			},
 		}
 	},
-	auto: true,
 	onSuccess(data) {
 		certificate.template = data.value
 	},

frontend/src/pages/Profile.vue

@@ -124,19 +124,13 @@ const props = defineProps({
 
 onMounted(() => {
 	if ($user.data) profile.reload()
-
 	setActiveTab()
 })
 
 const profile = createResource({
-	url: 'frappe.client.get',
-	makeParams(values) {
-		return {
-			doctype: 'User',
-			filters: {
-				username: props.username,
-			},
-		}
+	url: 'lms.lms.api.get_profile_details',
+	params: {
+		username: props.username,
 	},
 })
 
@@ -198,19 +192,11 @@ const hasHigherAccess = () => {
 	return $user.data?.is_evaluator || $user.data?.is_moderator
 }
 
-const isEvaluatorOrModerator = () => {
-	return (
-		profile.data?.roles.filter(
-			(row) => row.role === 'Moderator' || row.role === 'Evaluator'
-		).length > 0
-	)
-}
-
 const getTabButtons = () => {
 	let buttons = [{ label: 'About' }, { label: 'Certificates' }]
 	if ($user.data?.is_moderator) buttons.push({ label: 'Roles' })
 
-	if (hasHigherAccess() && isEvaluatorOrModerator()) {
+	if (hasHigherAccess()) {
 		buttons.push({ label: 'Slots' })
 		buttons.push({ label: 'Schedule' })
 	}

frontend/src/pages/ProfileEvaluationSchedule.vue

@@ -36,7 +36,7 @@
 			</Calendar>
 		</div>
 	</div>
-	<Event v-model="showEvent" :event="currentEvent" />
+	<Event v-if="showEvent" v-model="showEvent" :event="currentEvent" />
 </template>
 <script setup>
 import { Calendar, createListResource, Button } from 'frappe-ui'

frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue

@@ -153,6 +153,7 @@ import { Play, X, Check, Settings } from 'lucide-vue-next'
 import { sessionStore } from '@/stores/session'
 import { useRouter } from 'vue-router'
 import { openSettings } from '@/utils'
+import { useSettings } from '@/stores/settings'
 
 const user = inject<any>('$user')
 const code = ref<string | null>('')
@@ -162,7 +163,8 @@ const errorMessage = ref<string | null>(null)
 const testCaseSection = ref<HTMLElement | null>(null)
 const testCases = ref<TestCase[]>([])
 const boilerplate = ref<string>('')
-const { brand, livecodeURL } = sessionStore()
+const { brand } = sessionStore()
+const { livecodeURL } = useSettings()
 const router = useRouter()
 const fromLesson = ref(false)
 const falconURL = ref<string>('https://falcon.frappe.io/')

frontend/src/stores/session.js

@@ -54,16 +54,6 @@ export const sessionStore = defineStore('lms-session', () => {
 		},
 	})
 
-	const livecodeURL = createResource({
-		url: 'frappe.client.get_single_value',
-		params: {
-			doctype: 'LMS Settings',
-			field: 'livecode_url',
-		},
-		cache: 'livecodeURL',
-		auto: user.value ? true : false,
-	})
-
 	return {
 		user,
 		isLoggedIn,
@@ -71,6 +61,5 @@ export const sessionStore = defineStore('lms-session', () => {
 		logout,
 		brand,
 		branding,
-		livecodeURL,
 	}
 })

frontend/src/stores/settings.js

@@ -41,6 +41,13 @@ export const useSettings = defineStore('settings', () => {
 		auto: false,
 	})
 
+	const livecodeURL = createResource({
+		url: 'lms.lms.api.get_lms_setting',
+		params: { field: 'livecode_url' },
+		auto: true,
+		cache: ['livecodeURL'],
+	})
+
 	return {
 		isSettingsOpen,
 		activeTab,
@@ -49,5 +56,6 @@ export const useSettings = defineStore('settings', () => {
 		contactUsEmail,
 		contactUsURL,
 		sidebarSettings,
+		livecodeURL,
 	}
 })

lms/lms/api.py

@@ -1672,3 +1672,13 @@ def get_pwa_manifest():
 	}
 
 	return Response(json.dumps(manifest), status=200, content_type="application/manifest+json")
+
+
+@frappe.whitelist()
+def get_profile_details(username):
+	return frappe.db.get_value(
+		"User",
+		{"username": username},
+		["full_name", "name", "username", "user_image", "bio", "headline", "cover_image"],
+		as_dict=True,
+	)

lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json

@@ -84,7 +84,7 @@
  "grid_page_length": 50,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2025-07-07 20:37:22.449149",
+ "modified": "2025-11-06 11:38:35.903520",
  "modified_by": "sayali@frappe.io",
  "module": "LMS",
  "name": "LMS Badge Assignment",
@@ -135,6 +135,30 @@
    "report": 1,
    "role": "LMS Student",
    "share": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Batch Evaluator",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Course Creator",
+   "share": 1,
+   "write": 1
   }
  ],
  "row_format": "Dynamic",