fix: spacing and widths

chore: semantic release action

.github/workflows/on_release.yml

@@ -0,0 +1,32 @@
+name: Generate Semantic Release
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Entire Repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Setup dependencies
+        run: |
+          npm install @semantic-release/git @semantic-release/exec --no-save
+      - name: Create Release
+        env:
+          GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+          GIT_AUTHOR_NAME: "Frappe PR Bot"
+          GIT_AUTHOR_EMAIL: "developers@frappe.io"
+          GIT_COMMITTER_NAME: "Frappe PR Bot"
+          GIT_COMMITTER_EMAIL: "developers@frappe.io"
+        run: npx semantic-release

.github/workflows/release_notes.yml

@@ -0,0 +1,39 @@
+# This action:
+#
+# 1. Generates release notes using github API.
+# 2. Strips unnecessary info like chore/style etc from notes.
+# 3. Updates release info.
+
+name: 'Release Notes'
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag of release like v2.0.0'
+        required: true
+        type: string
+  release:
+    types: [released]
+
+permissions:
+  contents: read
+
+jobs:
+  regen-notes:
+    name: 'Regenerate release notes'
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Update notes
+      run: |
+        NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json"  /repos/frappe/lms/releases/generate-notes  -f tag_name=$RELEASE_TAG \
+          | jq -r '.body' \
+          | sed -E '/^\* (chore|ci|test|docs|style)/d' \
+          | sed -E 's/by @mergify //'
+        )
+        RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/tags/$RELEASE_TAG | jq -r '.id')
+        gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/frappe/lms/releases/$RELEASE_ID -f body="$NEW_NOTES"
+      env:
+        GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+        RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}

.gitignore

@@ -12,4 +12,3 @@ node_modules
 package-lock.json
 lms/public/frontend
 lms/www/lms.html
-frappe-ui

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "frappe-ui"]
-	path = frappe-ui
-	url = https://github.com/pateljannat/frappe-ui

.releaserc

@@ -0,0 +1,21 @@
+{
+	"branches": ["develop"],
+	"plugins": [
+		"@semantic-release/commit-analyzer", {
+			"preset": "angular"
+		},
+		"@semantic-release/release-notes-generator",
+		[
+			"@semantic-release/exec", {
+				"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" lms/__init__.py'
+			}
+		],
+		[
+			"@semantic-release/git", {
+				"assets": ["lms/__init__.py"],
+				"message": "chore(release): Bumped to Version ${nextRelease.version}"
+			}
+		],
+		"@semantic-release/github"
+	]
+}

frontend/src/components/BatchCard.vue

@@ -3,7 +3,7 @@
 		class="flex flex-col shadow hover:bg-gray-100 rounded-md p-4 h-full"
 		style="min-height: 150px"
 	>
-		<div class="text-xl font-semibold mb-2">
+		<div class="text-lg leading-5 font-semibold mb-2">
 			{{ batch.title }}
 		</div>
 		<Badge
@@ -22,18 +22,17 @@
 		>
 			{{ __('Sold Out') }}
 		</Badge>
-		<div class="short-introduction">
+		<div class="short-introduction text-sm text-gray-700">
 			{{ batch.description }}
 		</div>
+		<div v-if="batch.amount" class="font-semibold mb-4">
+			{{ batch.price }}
+		</div>
 		<div class="flex flex-col space-y-2 mt-auto">
-			<div v-if="batch.amount" class="font-semibold text-lg">
-				{{ batch.price }}
-			</div>
-
 			<DateRange
 				:startDate="batch.start_date"
 				:endDate="batch.end_date"
-				class="text-sm text-gray-700 mb-3"
+				class="text-sm text-gray-700"
 			/>
 			<div class="flex items-center text-sm text-gray-700">
 				<Clock class="h-4 w-4 stroke-1.5 mr-2 text-gray-700" />
@@ -50,18 +49,21 @@
 					{{ batch.timezone }}
 				</span>
 			</div>
-			<div v-if="batch.instructors?.length" class="flex avatar-group overlap">
+		</div>
-				<div
+		<div
-					class="h-6 mr-1"
+			v-if="batch.instructors?.length"
-					:class="{ 'avatar-group overlap': batch.instructors.length > 1 }"
+			class="flex avatar-group overlap mt-4"
-				>
+		>
-					<UserAvatar
+			<div
-						v-for="instructor in batch.instructors"
+				class="h-6 mr-1"
-						:user="instructor"
+				:class="{ 'avatar-group overlap': batch.instructors.length > 1 }"
-					/>
+			>
-				</div>
+				<UserAvatar
-				<CourseInstructors :instructors="batch.instructors" />
+					v-for="instructor in batch.instructors"
+					:user="instructor"
+				/>
 			</div>
+			<CourseInstructors :instructors="batch.instructors" />
 		</div>
 	</div>
 </template>
@@ -88,7 +90,7 @@ const props = defineProps({
 	text-overflow: ellipsis;
 	width: 100%;
 	overflow: hidden;
-	margin: 0.25rem 0 1.25rem;
+	margin: 0.25rem 0 1rem;
 	line-height: 1.5;
 }
 

frontend/src/components/CourseCard.vue

@@ -72,7 +72,7 @@
 				{{ course.title }}
 			</div>
 
-			<div class="short-introduction">
+			<div class="short-introduction text-gray-700 text-sm">
 				{{ course.short_introduction }}
 			</div>
 

frontend/src/components/Modals/Question.vue

@@ -1,147 +0,0 @@
-<template>
-	<Dialog v-model="show" :options="dialogOptions">
-		<template #body-content>
-			<div class="space-y-4">
-				<div>
-					<label class="block text-xs text-gray-600 mb-1">
-						{{ __('Question') }}
-					</label>
-					<TextEditor
-						:content="question.question"
-						@change="(val) => (question.question = val)"
-						:editable="true"
-						:fixedMenu="true"
-						editorClass="prose-sm max-w-none border-b border-x bg-gray-100 rounded-b-md py-1 px-2 min-h-[7rem]"
-					/>
-				</div>
-				<FormControl
-					:label="__('Type')"
-					v-model="question.type"
-					type="select"
-					:options="['Choices', 'User Input']"
-					class="pb-2"
-				/>
-				<div v-if="question.type == 'Choices'" class="divide-y">
-					<div v-for="n in 4" class="space-y-4 py-2">
-						<FormControl
-							:label="__('Option') + ' ' + n"
-							v-model="question[`option_${n}`]"
-						/>
-						<FormControl
-							:label="__('Explanation')"
-							v-model="question[`explanation_${n}`]"
-						/>
-						<FormControl
-							:label="__('Correct Answer')"
-							v-model="question[`correct_answer_${n}`]"
-							type="checkbox"
-						/>
-					</div>
-				</div>
-				<div v-else v-for="n in 4" class="space-y-2">
-					<FormControl
-						:label="__('Possibility') + ' ' + n"
-						v-model="question[`possibility_${n}`]"
-					/>
-				</div>
-			</div>
-		</template>
-	</Dialog>
-</template>
-<script setup>
-import { Dialog, FormControl, TextEditor, createResource } from 'frappe-ui'
-import { computed, onMounted, reactive, inject } from 'vue'
-
-const show = defineModel()
-const user = inject('$user')
-const question = reactive({
-	question: '',
-	type: 'Choices',
-})
-
-onMounted(() => {
-	populateFields()
-	console.log(props.questionName)
-	if (
-		props.questionName == 'new' &&
-		!user.data?.is_moderator &&
-		!user.data?.is_instructor
-	) {
-		router.push({ name: 'Courses' })
-	}
-
-	if (props.courseName !== 'new') {
-		questionDoc.reload()
-	}
-	window.addEventListener('keydown', keyboardShortcut)
-})
-
-const props = defineProps({
-	title: {
-		type: String,
-		default: __('Add a Question'),
-	},
-	questionName: {
-		type: String,
-	},
-})
-
-const questionDoc = createResource({
-	url: 'frappe.client.get',
-	makeParams: (values) => {
-		return {
-			doctype: 'LMS Question',
-			name: props.questionName,
-		}
-	},
-	onSuccess(data) {
-		let counter = 1
-		Object.keys(data).forEach((key) => {
-			if (Object.hasOwn(question, key)) question[key] = data[key]
-		})
-		while (counter <= 4) {
-			question[`is_correct_${counter}`] = question[`is_correct_${counter}`]
-				? true
-				: false
-		}
-	},
-})
-
-const populateFields = () => {
-	let fields = ['option', 'correct_answer', 'explanation', 'possibility']
-	let counter = 1
-	fields.forEach((field) => {
-		while (counter <= 4) {
-			question[`${field}_${counter}`] = field === 'correct_answer' ? false : ''
-			counter++
-		}
-	})
-}
-
-const keyboardShortcut = (e) => {
-	if (
-		e.key === 's' &&
-		(e.ctrlKey || e.metaKey) &&
-		!e.target.classList.contains('ProseMirror')
-	) {
-		submitQuestion()
-		e.preventDefault()
-	}
-}
-
-const dialogOptions = computed(() => {
-	return {
-		title: __(props.title),
-		size: 'xl',
-		actions: [
-			{
-				label: __('Submit'),
-				variant: 'solid',
-				onClick: (close) => {
-					submitQuestion(close)
-				},
-			},
-		],
-	}
-})
-</script>

frontend/src/components/Quiz.vue

@@ -3,9 +3,7 @@
 		<div class="bg-blue-100 py-2 px-2 mb-4 rounded-md text-sm text-blue-800">
 			<div class="leading-relaxed">
 				{{
-					__('This quiz consists of {0} questions.').format(
+					__('This quiz consists of {0} questions.').format(questions.length)
-						quiz.data.questions.length
-					)
 				}}
 			</div>
 			<div v-if="quiz.data.passing_percentage" class="leading-relaxed">
@@ -59,7 +57,7 @@
 			</div>
 		</div>
 		<div v-else-if="!quizSubmission.data">
-			<div v-for="(question, qtidx) in quiz.data.questions">
+			<div v-for="(question, qtidx) in questions">
 				<div
 					v-if="qtidx == activeQuestion - 1 && questionDetails.data"
 					class="border rounded-md p-5"
@@ -166,7 +164,7 @@
 							{{
 								__('Question {0} of {1}').format(
 									activeQuestion,
-									quiz.data.questions.length
+									questions.length
 								)
 							}}
 						</div>
@@ -179,7 +177,7 @@
 							</span>
 						</Button>
 						<Button
-							v-else-if="activeQuestion != quiz.data.questions.length"
+							v-else-if="activeQuestion != questions.length"
 							@click="nextQuetion()"
 						>
 							<span>
@@ -250,6 +248,7 @@ const activeQuestion = ref(0)
 const currentQuestion = ref('')
 const selectedOptions = reactive([0, 0, 0, 0])
 const showAnswers = reactive([])
+let questions = reactive([])
 const possibleAnswer = ref(null)
 
 const props = defineProps({
@@ -270,15 +269,30 @@ const quiz = createResource({
 	cache: ['quiz', props.quizName],
 	auto: true,
 	onSuccess(data) {
-		if (data.shuffle_questions) {
+		populateQuestions()
-			data.questions = data.questions.sort(() => Math.random() - 0.5)
-		}
-		if (data.limit_questions_to) {
-			data.questions = data.questions.slice(0, data.limit_questions_to)
-		}
 	},
 })
 
+const populateQuestions = () => {
+	let data = quiz.data
+	if (data.shuffle_questions) {
+		questions = shuffleArray(data.questions)
+		if (data.limit_questions_to) {
+			questions = questions.slice(0, data.limit_questions_to)
+		}
+	} else {
+		questions = data.questions
+	}
+}
+
+const shuffleArray = (array) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1))
+		;[array[i], array[j]] = [array[j], array[i]]
+	}
+	return array
+}
+
 const attempts = createResource({
 	url: 'frappe.client.get_list',
 	makeParams(values) {
@@ -310,7 +324,7 @@ const attempts = createResource({
 watch(
 	() => quiz.data,
 	() => {
-		if (quiz.data) {
+		if (quiz.data && quiz.data.max_attempts) {
 			attempts.reload()
 			resetQuiz()
 		}
@@ -464,7 +478,7 @@ const submitQuiz = () => {
 
 const createSubmission = () => {
 	quizSubmission.reload().then(() => {
-		attempts.reload()
+		if (quiz.data && quiz.data.max_attempts) attempts.reload()
 	})
 }
 
@@ -473,6 +487,7 @@ const resetQuiz = () => {
 	selectedOptions.splice(0, selectedOptions.length, ...[0, 0, 0, 0])
 	showAnswers.length = 0
 	quizSubmission.reset()
+	populateQuestions()
 }
 
 const getSubmissionColumns = () => {

frontend/src/pages/JobDetail.vue

@@ -50,9 +50,9 @@
 				</Button>
 			</div>
 		</header>
-		<div v-if="job.data" class="w-3/4 mx-auto">
+		<div v-if="job.data" class="max-w-3xl mx-auto">
 			<div class="p-4">
-				<div class="flex mb-4">
+				<div class="flex mb-10">
 					<img
 						:src="job.data.company_logo"
 						class="w-16 h-16 rounded-lg object-contain mr-4"
@@ -62,40 +62,36 @@
 						<div class="text-2xl font-semibold mb-4">
 							{{ job.data.job_title }}
 						</div>
-						<div class="grid grid-cols-3 gap-8">
+						<div
-							<div class="grid grid-cols-1 gap-2">
+							class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-x-10 gap-y-2 md:gap-y-4"
-								<div class="flex items-center space-x-2">
+						>
-									<Building2 class="h-4 w-4 stroke-1.5" />
+							<div class="flex items-center space-x-2">
-									<span>{{ job.data.company_name }}</span>
+								<Building2 class="h-4 w-4 stroke-1.5" />
-								</div>
+								<span>{{ job.data.company_name }}</span>
-								<div class="flex items-center space-x-2">
-									<MapPin class="h-4 w-4 stroke-1.5" />
-									<span>{{ job.data.location }}</span>
-								</div>
 							</div>
-							<div class="grid grid-cols-1 gap-2">
+							<div class="flex items-center space-x-2">
-								<div class="flex items-center space-x-2">
+								<MapPin class="h-4 w-4 stroke-1.5" />
-									<ClipboardType class="h-4 w-4 stroke-1.5" />
+								<span>{{ job.data.location }}</span>
-									<span>{{ job.data.type }}</span>
-								</div>
-								<div class="flex items-center space-x-2">
-									<CalendarDays class="h-4 w-4 stroke-1.5" />
-									<span>{{
-										dayjs(job.data.creation).format('DD MMM YYYY')
-									}}</span>
-								</div>
 							</div>
-							<div class="grid grid-cols-1 h-fit">
+							<div class="flex items-center space-x-2">
-								<div
+								<ClipboardType class="h-4 w-4 stroke-1.5" />
-									v-if="applicationCount.data"
+								<span>{{ job.data.type }}</span>
-									class="flex items-center space-x-2"
+							</div>
+							<div class="flex items-center space-x-2">
+								<CalendarDays class="h-4 w-4 stroke-1.5" />
+								<span>
+									{{ dayjs(job.data.creation).format('DD MMM YYYY') }}
+								</span>
+							</div>
+							<div
+								v-if="applicationCount.data"
+								class="flex items-center space-x-2"
+							>
+								<SquareUserRound class="h-4 w-4 stroke-1.5" />
+								<span
+									>{{ applicationCount.data }}
+									{{ __('applications received') }}</span
 								>
-									<SquareUserRound class="h-4 w-4 stroke-1.5" />
-									<span
-										>{{ applicationCount.data }}
-										{{ __('applications received') }}</span
-									>
-								</div>
 							</div>
 						</div>
 					</div>

frontend/src/pages/QuizCreation.vue

@@ -1,209 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="breadcrumbs" />
-	</header>
-	<div class="w-3/4 mx-auto py-5">
-		<!-- Details -->
-		<div class="mb-8">
-			<div class="text-sm font-semibold mb-4">
-				{{ __('Details') }}
-			</div>
-			<div class="grid grid-cols-2 gap-5">
-				<div class="space-y-2">
-					<FormControl v-model="quiz.title" :label="__('Title')" />
-					<FormControl
-						v-model="quiz.max_attempts"
-						:label="__('Maximun Attempts')"
-					/>
-					<FormControl
-						v-model="quiz.limit_questions_to"
-						:label="__('Limit Questions To')"
-					/>
-				</div>
-				<div class="space-y-2">
-					<FormControl v-model="quiz.total_marks" :label="__('Total Marks')" />
-					<FormControl
-						v-model="quiz.passing_percentage"
-						:label="__('Passing Percentage')"
-					/>
-				</div>
-			</div>
-		</div>
-
-		<!-- Settings -->
-		<div class="mb-8">
-			<div class="text-sm font-semibold mb-4">
-				{{ __('Settings') }}
-			</div>
-			<div class="grid grid-cols-3 gap-5 my-4">
-				<FormControl
-					v-model="quiz.show_answers"
-					type="checkbox"
-					:label="__('Show Answers')"
-				/>
-				<FormControl
-					v-model="quiz.show_submission_history"
-					type="checkbox"
-					:label="__('Show Submission History')"
-				/>
-				<FormControl
-					v-model="quiz.shuffle_questions"
-					type="checkbox"
-					:label="__('Shuffle Questions')"
-				/>
-			</div>
-		</div>
-
-		<!-- Questions -->
-		<div>
-			<div class="flex items-center justify-between mb-4">
-				<div class="text-sm font-semibold">
-					{{ __('Questions') }}
-				</div>
-				<Button @click="openQuestionModal()">
-					<template #prefix>
-						<Plus class="w-4 h-4" />
-					</template>
-					{{ __('New Question') }}
-				</Button>
-			</div>
-			<ListView
-				:columns="questionColumns"
-				:rows="quiz.questions"
-				row-key="name"
-				:options="{
-					showTooltip: false,
-				}"
-			>
-				<ListHeader
-					class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-				>
-					<ListHeaderItem :item="item" v-for="item in questionColumns" />
-				</ListHeader>
-				<ListRows>
-					<ListRow
-						:row="row"
-						v-slot="{ idx, column, item }"
-						v-for="row in quiz.questions"
-						@click="openQuestionModal(row.question)"
-					>
-						<ListRowItem :item="item">
-							<div
-								v-if="column.key == 'question_detail'"
-								class="text-xs truncate"
-							>
-								{{ item }}
-							</div>
-							<div v-else class="text-xs">
-								{{ item }}
-							</div>
-						</ListRowItem>
-					</ListRow>
-				</ListRows>
-			</ListView>
-		</div>
-	</div>
-	<Question v-model="showQuestionModal" :questionName="currentQuestion" />
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	createDocumentResource,
-	FormControl,
-	ListView,
-	ListHeader,
-	ListHeaderItem,
-	ListRows,
-	ListRow,
-	ListRowItem,
-	Button,
-} from 'frappe-ui'
-import { computed, reactive, ref } from 'vue'
-import { Plus } from 'lucide-vue-next'
-import Question from '@/components/Modals/Question.vue'
-
-const showQuestionModal = ref(false)
-const currentQuestion = ref(null)
-
-const props = defineProps({
-	quizID: {
-		type: String,
-		required: true,
-	},
-})
-
-const quiz = reactive({
-	title: '',
-	total_marks: '',
-	passing_percentage: '',
-	max_attempts: 0,
-	limit_questions_to: 0,
-	show_answers: true,
-	show_submission_history: false,
-	shuffle_questions: false,
-	questions: [],
-})
-
-const quizDetails = createDocumentResource({
-	doctype: 'LMS Quiz',
-	name: props.quizID,
-	auto: true,
-	cache: ['quiz', props.quizID],
-	onSuccess(data) {
-		Object.keys(data).forEach((key) => {
-			if (Object.hasOwn(quiz, key)) quiz[key] = data[key]
-		})
-
-		let checkboxes = [
-			'show_answers',
-			'show_submission_history',
-			'shuffle_questions',
-		]
-		for (let idx in checkboxes) {
-			let key = checkboxes[idx]
-			quiz[key] = quiz[key] ? true : false
-		}
-	},
-})
-
-const questionColumns = computed(() => {
-	return [
-		{
-			label: __('ID'),
-			key: 'question',
-			width: '25%',
-		},
-		{
-			label: __('Question'),
-			key: __('question_detail'),
-			width: '60%',
-		},
-		{
-			label: __('Marks'),
-			key: 'marks',
-			width: '10%',
-		},
-	]
-})
-
-const openQuestionModal = (question = null) => {
-	console.log('called')
-	console.log(question)
-	currentQuestion.value = question
-	showQuestionModal.value = true
-}
-
-const breadcrumbs = computed(() => {
-	let crumbs = [
-		{
-			label: __('Quizzes'),
-			route: {
-				name: 'Quizzes',
-			},
-		},
-	]
-	return crumbs
-})
-</script>

frontend/src/pages/Quizzes.vue

@@ -1,108 +0,0 @@
-<template>
-	<header
-		class="sticky top-0 z-10 flex items-center justify-between border-b bg-white px-3 py-2.5 sm:px-5"
-	>
-		<Breadcrumbs :items="breadcrumbs" />
-		<Button variant="solid">
-			<template #prefix>
-				<Plus class="w-4 h-4"/>
-			</template>
-			{{ __('New Quiz') }}
-		</Button>
-	</header>
-	<div v-if="quizzes.data?.length" class="w-3/4 mx-auto py-5">
-		<ListView
-			:columns="quizColumns"
-			:rows="quizzes.data"
-			row-key="name"
-			:options="{ showTooltip: false, selectable: false }"
-		>
-			<ListHeader
-				class="mb-2 grid items-center space-x-4 rounded bg-gray-100 p-2"
-			>
-				<ListHeaderItem :item="item" v-for="item in quizColumns">
-				</ListHeaderItem>
-			</ListHeader>
-			<ListRows>
-				<router-link
-					v-for="row in quizzes.data"
-					:to="{
-						name: 'QuizCreation',
-						params: {
-							quizID: row.name,
-						},
-					}"
-				>
-					<ListRow :row="row" />
-				</router-link>
-			</ListRows>
-		</ListView>
-	</div>
-</template>
-<script setup>
-import {
-	Breadcrumbs,
-	createListResource,
-	ListView,
-	ListRows,
-	ListRow,
-	ListHeader,
-	ListHeaderItem,
-	Button,
-} from 'frappe-ui'
-import { computed, inject } from 'vue'
-import { Plus } from 'lucide-vue-next'
-
-const user = inject('$user')
-
-const quizFilter = computed(() => {
-	if (user.data?.is_moderator) return {}
-	return {
-		owner: user.data?.name,
-	}
-})
-
-const quizzes = createListResource({
-	doctype: 'LMS Quiz',
-	filters: quizFilter,
-	fields: ['name', 'title', 'passing_percentage', 'total_marks'],
-	auto: true,
-	cache: ['quizzes', user.data?.name],
-	onSuccess(data) {
-		data.forEach((row) => {})
-	},
-})
-
-const quizColumns = computed(() => {
-	return [
-		{
-			label: __('Title'),
-			key: 'title',
-			width: 2,
-		},
-		{
-			label: __('Total Marks'),
-			key: 'total_marks',
-			width: 1,
-			align: 'center',
-		},
-		{
-			label: __('Passing Percentage'),
-			key: 'passing_percentage',
-			width: 1,
-			align: 'center',
-		},
-	]
-})
-
-const breadcrumbs = computed(() => {
-	return [
-		{
-			label: __('Quizzes'),
-			route: {
-				name: 'Quizzes',
-			},
-		},
-	]
-})
-</script>

frontend/src/router.js

@@ -141,17 +141,6 @@ const routes = [
 		component: () => import('@/pages/Badge.vue'),
 		props: true,
 	},
-	{
-		path: '/quizzes',
-		name: 'Quizzes',
-		component: () => import('@/pages/Quizzes.vue'),
-	},
-	{
-		path: '/quizzes/:quizID',
-		name: 'QuizCreation',
-		component: () => import('@/pages/QuizCreation.vue'),
-		props: true,
-	},
 ]
 
 let router = createRouter({

frontend/src/translation.js

@@ -2,7 +2,6 @@ import { createResource } from 'frappe-ui'
 
 export default function translationPlugin(app) {
 	app.config.globalProperties.__ = translate
-	window.__ = translate
 	if (!window.translatedMessages) fetchTranslations()
 }
 

frontend/yarn.lock

@@ -68,6 +68,13 @@
   dependencies:
     "@codexteam/icons" "^0.0.5"
 
+"@editorjs/image@^2.9.2":
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@editorjs/image/-/image-2.9.2.tgz#c8bea65a578fab65a1a75df1223b4fd8f06b57d5"
+  integrity sha512-n09sMieGW8cksoeflpplzvbmFH2bdVzVTWbnidPWAHaeU467HRteoXU9yfGBB7+eeHZLnmCulQ2dr6ae+G2niw==
+  dependencies:
+    "@codexteam/icons" "^0.3.0"
+
 "@editorjs/inline-code@^1.5.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@editorjs/inline-code/-/inline-code-1.5.0.tgz#ad5849bac3396b9dad22dceeda76198dd991e426"
@@ -1875,16 +1882,8 @@ source-map-js@^1.2.0:
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
   integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
 
-"string-width-cjs@npm:string-width@^4.2.0":
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  version "4.2.3"
+  name string-width-cjs
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1902,14 +1901,8 @@ string-width@^5.0.1, string-width@^5.1.2:
     emoji-regex "^9.2.2"
     strip-ansi "^7.0.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
+  name strip-ansi-cjs
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==

lms/hooks.py

@@ -176,7 +176,10 @@ update_website_context = [
 ]
 
 jinja = {
-	"methods": ["lms.lms.utils.get_signup_optin_checks"],
+	"methods": [
+		"lms.lms.utils.get_signup_optin_checks",
+		"lms.lms.utils.get_tags",
+	],
 	"filters": [],
 }
 ## Specify the additional tabs to be included in the user profile page.

lms/lms/doctype/lms_certificate_request/lms_certificate_request.py

@@ -26,9 +26,6 @@ class LMSCertificateRequest(Document):
 		self.validate_if_existing_requests()
 		self.validate_evaluation_end_date()
 
-	def after_insert(self):
-		self.send_notification()
-
 	def set_evaluator(self):
 		if not self.evaluator:
 			self.evaluator = get_evaluator(self.course, self.batch_name)
@@ -59,6 +56,7 @@ class LMSCertificateRequest(Document):
 				"evaluator": self.evaluator,
 				"date": self.date,
 				"start_time": self.start_time,
+				"member": ["!=", self.member],
 			},
 		):
 			frappe.throw(_("The slot is already booked by another participant."))
@@ -110,35 +108,6 @@ class LMSCertificateRequest(Document):
 						)
 					)
 
-	def send_notification(self):
-		outgoing_email_account = frappe.get_cached_value(
-			"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
-		)
-		if outgoing_email_account or frappe.conf.get("mail_login"):
-			subject = _("Your evaluation slot has been booked")
-			template = "certificate_request_notification"
-
-			args = {
-				"course": frappe.db.get_value("LMS Course", self.course, "title"),
-				"timezone": frappe.db.get_value("LMS Batch", self.batch_name, "timezone")
-				if self.batch_name
-				else "",
-				"date": format_date(self.date, "medium"),
-				"member_name": self.member_name,
-				"start_time": format_time(self.start_time, "short"),
-				"evaluator": frappe.db.get_value("User", self.evaluator, "full_name"),
-			}
-
-			frappe.sendmail(
-				recipients=[self.member],
-				cc=[self.evaluator],
-				subject=subject,
-				template=template,
-				args=args,
-				header=[subject, "green"],
-				retry=3,
-			)
-
 
 def schedule_evals():
 	if frappe.db.get_single_value("LMS Settings", "send_calendar_invite_for_evaluations"):

lms/lms/doctype/lms_question/lms_question.json

@@ -196,7 +196,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2024-08-01 12:53:22.540990",
+ "modified": "2024-08-01 13:01:55.000072",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Question",

lms/lms/doctype/lms_quiz/lms_quiz.json

@@ -74,7 +74,6 @@
    "default": "1",
    "fieldname": "show_answers",
    "fieldtype": "Check",
-   "in_standard_filter": 1,
    "label": "Show Answers"
   },
   {
@@ -99,8 +98,6 @@
   {
    "fieldname": "passing_percentage",
    "fieldtype": "Int",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Passing Percentage",
    "non_negative": 1,
    "reqd": 1
@@ -113,7 +110,6 @@
    "default": "0",
    "fieldname": "total_marks",
    "fieldtype": "Int",
-   "in_list_view": 1,
    "label": "Total Marks",
    "non_negative": 1,
    "read_only": 1,
@@ -137,7 +133,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-07-19 18:21:26.681501",
+ "modified": "2024-06-27 22:03:48.576489",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",

lms/lms/doctype/lms_quiz_question/lms_quiz_question.json

@@ -6,10 +6,7 @@
  "engine": "InnoDB",
  "field_order": [
   "question",
-  "column_break_qcpo",
+  "marks"
-  "marks",
-  "section_break_huup",
-  "question_detail"
  ],
  "fields": [
   {
@@ -28,28 +25,12 @@
    "label": "Marks",
    "non_negative": 1,
    "reqd": 1
-  },
-  {
-   "fetch_from": "question.question",
-   "fieldname": "question_detail",
-   "fieldtype": "Text",
-   "in_list_view": 1,
-   "label": "Question Detail",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_qcpo",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "section_break_huup",
-   "fieldtype": "Section Break"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-07-29 15:10:09.662715",
+ "modified": "2023-10-16 19:51:03.893144",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz Question",

lms/lms/notification/certificate_request_creation/certificate_request_creation.json

@@ -6,14 +6,14 @@
  "docstatus": 0,
  "doctype": "Notification",
  "document_type": "LMS Certificate Request",
- "enabled": 0,
+ "enabled": 1,
  "event": "New",
  "idx": 0,
  "is_standard": 1,
- "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }} </p>\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
+ "message": "{% set title = frappe.db.get_value(\"LMS Course\", doc.course, \"title\") %}\n{% set timezone = frappe.db.get_value(\"LMS Batch\", doc.batch, \"timezone\") %}\n{% set timezone = timezone if timezone else '' %}\n{% set evaluator_name = frappe.db.get_value(\"User\", doc.evaluator, \"full_name\") %}\n\n<p> {{ _(\"Hey {0}\").format(doc.member_name) }} </p>\n<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, frappe.utils.format_date(doc.date, \"medium\"), frappe.utils.format_time(doc.start_time, \"short\"), timezone) }}</p>\n<p> {{ _(\"Your evaluator is {0}\").format(evaluator_name) }}\n<p> {{ _(\"Please prepare well and be on time for the evaluations.\") }} </p>\n",
  "message_type": "HTML",
- "modified": "2024-08-01 12:17:40.647724",
+ "modified": "2024-07-10 15:51:03.429317",
- "modified_by": "jannat@frappe.io",
+ "modified_by": "sayali@erpnext.com",
  "module": "LMS",
  "name": "Certificate Request Creation",
  "owner": "Administrator",

lms/templates/emails/certificate_request_notification.html

@@ -1,4 +0,0 @@
-<p> {{ _("Hey {0}").format(member_name) }} </p>
-<p> {{ _('Your evaluation for the course {0} has been scheduled on {1} at {2} {3}.').format(title, date, start_time, timezone) }}</p>
-<p> {{ _("Your evaluator is {0}").format(evaluator) }} </p>
-<p> {{ _("Please prepare well and be on time for the evaluations.") }} </p>

package.json

@@ -2,7 +2,7 @@
   "name": "frappe_lms",
   "version": "1.0.0",
   "description": "Easy to use, open-source, Learning Management System",
-  "workspaces": [
+  "workspaces1": [
     "frappe-ui",
     "frontend"
   ],
@@ -26,5 +26,8 @@
   "devDependencies": {
     "cypress": "^13.9.0",
     "cypress-file-upload": "^5.0.8"
+  },
+  "dependencies": {
+    "pre-commit": "^1.2.2"
   }
 }