diff --git a/frontend/src/components/Assessments.vue b/frontend/src/components/Assessments.vue
index 18dd5f2a..2edf9984 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/components/Assessments.vue
@@ -11,7 +11,7 @@
 				{{ __('Add') }}
 			</Button>
 		</div>
-		<div v-if="assessments.data?.length">
+		<div v-if="assessments.data?.length" class="text-sm">
 			<ListView
 				:columns="getAssessmentColumns()"
 				:rows="assessments.data"
diff --git a/frontend/src/components/BatchDashboard.vue b/frontend/src/components/BatchDashboard.vue
index 3c1b6aad..196cbf88 100644
--- a/frontend/src/components/BatchDashboard.vue
+++ b/frontend/src/components/BatchDashboard.vue
@@ -1,17 +1,18 @@
 <template>
-	<div>
+	<div class="space-y-10">
 		<UpcomingEvaluations
 			:batch="batch.data.name"
 			:endDate="batch.data.evaluation_end_date"
 			:courses="batch.data.courses"
-			:isStudent="isStudent"
 		/>
 		<Assessments :batch="batch.data.name" />
+		<StudentHeatmap />
 	</div>
 </template>
 <script setup>
 import UpcomingEvaluations from '@/components/UpcomingEvaluations.vue'
 import Assessments from '@/components/Assessments.vue'
+import StudentHeatmap from '@/components/StudentHeatmap.vue'
 
 const props = defineProps({
 	batch: {
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
index dce49cbf..649d096e 100644
--- a/frontend/src/components/BatchStudents.vue
+++ b/frontend/src/components/BatchStudents.vue
@@ -8,10 +8,10 @@
 		<div class="grid grid-cols-3 gap-5 mb-8">
 			<div class="flex items-center shadow py-2 px-3 rounded-md">
 				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<User class="w-18 h-18 stroke-1.5 text-gray-700" />
+					<User class="w-5 h-5 stroke-1.5 text-gray-700" />
 				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
 						{{ students.data?.length }}
 					</span>
 					<span class="text-gray-700">
@@ -22,10 +22,10 @@
 
 			<div class="flex items-center shadow py-2 px-3 rounded-md">
 				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<BookOpen class="w-18 h-18 stroke-1.5 text-gray-700" />
+					<BookOpen class="w-5 h-5 stroke-1.5 text-gray-700" />
 				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
 						{{ batch.courses?.length }}
 					</span>
 					<span class="text-gray-700">
@@ -36,10 +36,10 @@
 
 			<div class="flex items-center shadow py-2 px-3 rounded-md">
 				<div class="p-2 rounded-md bg-gray-100 mr-3">
-					<ShieldCheck class="w-18 h-18 stroke-1.5 text-gray-700" />
+					<ShieldCheck class="w-5 h-5 stroke-1.5 text-gray-700" />
 				</div>
-				<div class="flex flex-col">
-					<span class="text-xl font-semibold mb-1">
+				<div class="flex items-center space-x-2">
+					<span class="font-semibold">
 						{{ assessmentCount }}
 					</span>
 					<span class="text-gray-700">
@@ -48,28 +48,33 @@
 				</div>
 			</div>
 		</div>
-		<div class="mb-8">
+		<div v-if="showProgressChart" class="mb-8">
 			<div class="text-gray-600 font-medium">
 				{{ __('Progress') }}
 			</div>
 			<ApexChart
-				v-if="showProgressChart"
 				:options="chartOptions"
 				:series="chartData"
 				type="bar"
-				height="350"
+				height="200"
 			/>
 			<div
 				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: #0f736b"></div>
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.green[600] }"
+					></div>
 					<div>
 						{{ __('Courses') }}
 					</div>
 				</div>
 				<div class="flex items-center space-x-2">
-					<div class="w-3 h-3" style="background-color: #0070cc"></div>
+					<div
+						class="w-3 h-3 rounded-sm"
+						:style="{ 'background-color': theme.colors.blue[600] }"
+					></div>
 					<div>
 						{{ __('Assessments') }}
 					</div>
@@ -125,7 +130,11 @@
 						@click="openStudentProgressModal(row)"
 					>
 						<template #default="{ column, item }">
-							<ListRowItem :item="row[column.key]" :align="column.align">
+							<ListRowItem
+								:item="row[column.key]"
+								:align="column.align"
+								class="text-sm"
+							>
 								<template #prefix>
 									<div v-if="column.key == 'full_name'">
 										<Avatar
@@ -141,16 +150,7 @@
 									class="flex items-center space-x-4 w-full"
 								>
 									<ProgressBar :progress="row[column.key]" size="sm" />
-								</div>
-								<div
-									v-else-if="column.key == 'copy'"
-									class="invisible group-hover:visible"
-								>
-									<Button variant="ghost" @click="copyEmail(row)">
-										<template #icon>
-											<Clipboard class="h-4 w-4 stroke-1.5" />
-										</template>
-									</Button>
+									<div class="text-xs">{{ row[column.key] }}%</div>
 								</div>
 								<div v-else>
 									{{ row[column.key] }}
@@ -216,6 +216,7 @@ import { showToast } from '@/utils'
 import ProgressBar from '@/components/ProgressBar.vue'
 import BatchStudentProgress from '@/components/Modals/BatchStudentProgress.vue'
 import ApexChart from 'vue3-apexcharts'
+import { theme } from '@/utils/theme'
 
 const showStudentModal = ref(false)
 const showStudentProgressModal = ref(false)
@@ -256,20 +257,16 @@ const getStudentColumns = () => {
 		{
 			label: 'Progress',
 			key: 'progress',
-			width: '10rem',
+			width: '15rem',
 			icon: 'activity',
 		},
 		{
 			label: 'Last Active',
 			key: 'last_active',
-			width: '15rem',
+			width: '10rem',
 			align: 'center',
 			icon: 'clock',
 		},
-		{
-			label: '',
-			key: 'copy',
-		},
 	]
 
 	return columns
@@ -352,8 +349,8 @@ const getChartData = () => {
 }
 
 const getChartOptions = (categories) => {
-	const courseColor = '#0F736B'
-	const assessmentColor = '#0070CC'
+	const courseColor = theme.colors.green[700]
+	const assessmentColor = theme.colors.blue[700]
 	const maxY =
 		students.data?.length % 5
 			? students.data?.length + (5 - (students.data?.length % 5))
@@ -362,7 +359,6 @@ const getChartOptions = (categories) => {
 	return {
 		chart: {
 			type: 'bar',
-			height: 50,
 			toolbar: {
 				show: false,
 			},
@@ -370,9 +366,10 @@ const getChartOptions = (categories) => {
 		plotOptions: {
 			bar: {
 				distributed: true,
-				borderRadius: 0,
+				borderRadius: 3,
+				borderRadiusApplication: 'end',
 				horizontal: true,
-				barHeight: '30%',
+				barHeight: '40%',
 			},
 		},
 		colors: Object.values(categories).map((item) =>
@@ -386,7 +383,7 @@ const getChartOptions = (categories) => {
 				},
 				rotate: 0,
 				formatter: function (value) {
-					return value.length > 20 ? `${value.substring(0, 20)}...` : value // Trim long labels
+					return value.length > 30 ? `${value.substring(0, 30)}...` : value // Trim long labels
 				},
 			},
 		},
@@ -395,15 +392,11 @@ const getChartOptions = (categories) => {
 			min: 0,
 			stepSize: 10,
 			tickAmount: maxY / 5,
+			/* reversed: true */
 		},
 	}
 }
 
-const copyEmail = (row) => {
-	navigator.clipboard.writeText(row.email)
-	showToast(__('Success'), __('Email copied to clipboard'), 'check')
-}
-
 watch(students, () => {
 	if (students.data?.length) {
 		assessmentCount.value = Object.keys(students.data?.[0].assessments).length
diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue
index 08e00c32..5b67184c 100644
--- a/frontend/src/components/LiveClass.vue
+++ b/frontend/src/components/LiveClass.vue
@@ -15,45 +15,55 @@
 	<div v-if="liveClasses.data?.length" class="grid grid-cols-2 gap-5">
 		<div
 			v-for="cls in liveClasses.data"
-			class="flex flex-col border rounded-md h-full text-sm text-gray-700 p-3"
+			class="flex flex-col border rounded-md h-full text-gray-700 p-3"
 		>
-			<div class="font-semibold text-gray-900 text-lg mb-4">
+			<div class="font-semibold text-gray-900 text-lg mb-1">
 				{{ cls.title }}
 			</div>
-			<div class="leading-5 text-gray-700 text-sm mb-4">
+			<div class="short-introduction">
 				{{ cls.description }}
 			</div>
-			<div class="flex items-center mb-2">
-				<Calendar class="w-4 h-4 stroke-1.5 text-gray-700" />
-				<span class="ml-2">
-					{{ dayjs(cls.date).format('DD MMMM YYYY') }}
-				</span>
-			</div>
-			<div class="flex items-center mb-5">
-				<Clock class="w-4 h-4 stroke-1.5" />
-				<span class="ml-2">
-					{{ formatTime(cls.time) }}
-				</span>
-			</div>
-			<div class="flex items-center space-x-2 text-gray-900 mt-auto">
-				<a
-					v-if="user.data?.is_moderator || user.data?.is_evaluator"
-					:href="cls.start_url"
-					target="_blank"
-					class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+			<div class="space-y-3">
+				<div class="flex items-center space-x-2">
+					<Calendar class="w-4 h-4 stroke-1.5" />
+					<span>
+						{{ dayjs(cls.date).format('DD MMMM YYYY') }}
+					</span>
+				</div>
+				<div class="flex items-center space-x-2">
+					<Clock class="w-4 h-4 stroke-1.5" />
+					<span>
+						{{ formatTime(cls.time) }}
+					</span>
+				</div>
+				<div
+					v-if="cls.date >= dayjs().format('YYYY-MM-DD')"
+					class="flex items-center space-x-2 text-gray-900 mt-auto"
 				>
-					<Monitor class="h-4 w-4 stroke-1.5" />
-					{{ __('Start') }}
-				</a>
-				<a
-					v-if="cls.date <= dayjs().format('YYYY-MM-DD')"
-					:href="cls.join_url"
-					target="_blank"
-					class="w-full cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
-				>
-					<Video class="h-4 w-4 stroke-1.5" />
-					{{ __('Join') }}
-				</a>
+					<a
+						v-if="user.data?.is_moderator || user.data?.is_evaluator"
+						:href="cls.start_url"
+						target="_blank"
+						class="w-1/2 cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+					>
+						<Monitor class="h-4 w-4 stroke-1.5" />
+						{{ __('Start') }}
+					</a>
+					<a
+						:href="cls.join_url"
+						target="_blank"
+						class="w-full cursor-pointer inline-flex items-center justify-center gap-2 transition-colors focus:outline-none text-gray-800 bg-gray-100 hover:bg-gray-200 active:bg-gray-300 focus-visible:ring focus-visible:ring-gray-400 h-7 text-base px-2 rounded"
+					>
+						<Video class="h-4 w-4 stroke-1.5" />
+						{{ __('Join') }}
+					</a>
+				</div>
+				<div v-else class="flex items-center space-x-2 text-yellow-700">
+					<Info class="w-4 h-4 stroke-1.5" />
+					<span>
+						{{ __('This class has ended') }}
+					</span>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -68,7 +78,7 @@
 </template>
 <script setup>
 import { createListResource, Button } from 'frappe-ui'
-import { Plus, Clock, Calendar, Video, Monitor } from 'lucide-vue-next'
+import { Plus, Clock, Calendar, Video, Monitor, Info } from 'lucide-vue-next'
 import { inject } from 'vue'
 import LiveClassModal from '@/components/Modals/LiveClassModal.vue'
 import { ref } from 'vue'
@@ -107,3 +117,15 @@ const openLiveClassModal = () => {
 	showLiveClassModal.value = true
 }
 </script>
+<style>
+.short-introduction {
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+	text-overflow: ellipsis;
+	width: 100%;
+	overflow: hidden;
+	margin: 0.25rem 0 1.5rem;
+	line-height: 1.5;
+}
+</style>
diff --git a/frontend/src/components/Modals/BatchStudentProgress.vue b/frontend/src/components/Modals/BatchStudentProgress.vue
index 6e726665..88478609 100644
--- a/frontend/src/components/Modals/BatchStudentProgress.vue
+++ b/frontend/src/components/Modals/BatchStudentProgress.vue
@@ -1,7 +1,12 @@
 <template>
-	<Dialog v-model="show" :options="{}">
+	<Dialog
+		v-model="show"
+		:options="{
+			size: 'xl',
+		}"
+	>
 		<template #body>
-			<div class="p-5 space-y-8 text-base">
+			<div class="p-5 space-y-10 text-base">
 				<div class="flex items-center space-x-2">
 					<Avatar :image="student.user_image" size="3xl" />
 					<div class="space-y-1">
@@ -19,13 +24,11 @@
 					</div>
 				</div>
 
-				<!-- Assessments -->
-				<div>
-					<div>
-						<div
-							class="grid grid-cols-[70%,30%] border-b pl-2 pb-1 mb-2 text-xs text-gray-700 font-medium"
-						>
-							<span>
+				<div class="space-y-8">
+					<!-- Assessments -->
+					<div class="space-y-2 text-sm">
+						<div class="flex items-center border-b pb-1 font-medium">
+							<span class="flex-1">
 								{{ __('Assessment') }}
 							</span>
 							<span>
@@ -34,9 +37,9 @@
 						</div>
 						<div
 							v-for="assessment in Object.keys(student.assessments)"
-							class="grid grid-cols-[70%,30%] pl-2 mb-2 text-gray-700 font-medium"
+							class="flex items-center text-gray-700 font-medium"
 						>
-							<span>
+							<span class="flex-1">
 								{{ assessment }}
 							</span>
 							<span v-if="isAssignment(student.assessments[assessment])">
@@ -49,15 +52,11 @@
 							</span>
 						</div>
 					</div>
-				</div>
 
-				<!-- Courses -->
-				<div>
-					<div>
-						<div
-							class="grid grid-cols-[70%,30%] mb-2 text-xs text-gray-700 border-b pl-2 pb-1 font-medium"
-						>
-							<span>
+					<!-- Courses -->
+					<div class="space-y-2 text-sm">
+						<div class="flex items-center border-b pb-1 font-medium">
+							<span class="flex-1">
 								{{ __('Courses') }}
 							</span>
 							<span>
@@ -66,9 +65,9 @@
 						</div>
 						<div
 							v-for="course in Object.keys(student.courses)"
-							class="grid grid-cols-[70%,30%] pl-2 mb-2 text-gray-700 font-medium"
+							class="flex items-center text-gray-700 font-medium"
 						>
-							<span>
+							<span class="flex-1">
 								{{ course }}
 							</span>
 							<span>
@@ -78,16 +77,15 @@
 					</div>
 				</div>
 
-				<!-- <span class="mt-4">
-                    {{ student }}
-                </span> -->
+				<!-- Heatmap -->
+				<StudentHeatmap :member="student.email" :base_days="120" />
 			</div>
 		</template>
 	</Dialog>
 </template>
 <script setup>
 import { Avatar, Badge, Dialog } from 'frappe-ui'
-import ProgressBar from '@/components/ProgressBar.vue'
+import StudentHeatmap from '@/components/StudentHeatmap.vue'
 
 const show = defineModel()
 const props = defineProps({
diff --git a/frontend/src/components/StudentHeatmap.vue b/frontend/src/components/StudentHeatmap.vue
new file mode 100644
index 00000000..5654e4c0
--- /dev/null
+++ b/frontend/src/components/StudentHeatmap.vue
@@ -0,0 +1,138 @@
+<template>
+	<div v-if="heatmap.data">
+		<div class="text-lg font-semibold mb-2">
+			{{ heatmap.data.total_activities }}
+			{{
+				heatmap.data.total_activities > 1 ? __('activities') : __('activity')
+			}}
+			{{ __('in the last') }}
+			{{ heatmap.data.weeks }}
+			{{ __('weeks') }}
+		</div>
+
+		<ApexChart :options="chartOptions" :series="chartSeries" height="240" />
+	</div>
+</template>
+<script setup>
+import { createResource } from 'frappe-ui'
+import { computed, inject, onMounted, ref, watch } from 'vue'
+import ApexChart from 'vue3-apexcharts'
+import { theme } from '@/utils/theme'
+
+const user = inject('$user')
+const labels = ref([])
+const memberName = ref(null)
+
+const props = defineProps({
+	member: {
+		type: String,
+	},
+	base_days: {
+		type: Number,
+		default: 200,
+	},
+})
+
+onMounted(() => {
+	memberName.value = props.member || user.data?.name
+})
+
+const heatmap = createResource({
+	url: 'lms.lms.api.get_heatmap_data',
+	makeParams(values) {
+		return {
+			member: values.member,
+			base_days: props.base_days,
+		}
+	},
+	auto: false,
+	cache: ['heatmap', memberName.value],
+})
+
+watch(memberName, (newVal) => {
+	heatmap.reload(
+		{
+			member: newVal,
+		},
+		{
+			onSuccess(data) {
+				labels.value = data.labels
+			},
+		}
+	)
+})
+
+const chartOptions = computed(() => {
+	return {
+		chart: {
+			type: 'heatmap',
+			toolbar: {
+				show: false,
+			},
+		},
+		highlightOnHover: false,
+		grid: {
+			show: false,
+		},
+		plotOptions: {
+			heatmap: {
+				radius: 8,
+				shadeIntensity: 0.2,
+				enableShades: true,
+				colorScale: {
+					ranges: [
+						{ from: 0, to: 0, color: theme.colors.gray[400] },
+						{ from: 1, to: 5, color: theme.colors.green[200] },
+						{ from: 6, to: 15, color: theme.colors.green[500] },
+						{ from: 16, to: 30, color: theme.colors.green[700] },
+						{ from: 31, to: 100, color: theme.colors.green[800] },
+					],
+				},
+			},
+		},
+		dataLabels: {
+			enabled: false,
+		},
+		xaxis: {
+			type: 'category',
+			categories: labels.value,
+			position: 'top',
+			axisBorder: {
+				show: false,
+			},
+			axisTicks: {
+				show: false,
+			},
+			tooltip: {
+				enabled: false,
+			},
+		},
+		yaxis: {
+			type: 'category',
+			categories: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+			reversed: true,
+			tooltip: {
+				enabled: false,
+			},
+		},
+		tooltip: {
+			custom: ({ series, seriesIndex, dataPointIndex, w }) => {
+				return `<div class="text-xs bg-gray-900 text-white font-medium p-1">
+					<div class="text-center">${heatmap.data.heatmap_data[seriesIndex].data[dataPointIndex].label}</div>
+				</div>`
+			},
+		},
+	}
+})
+
+const chartSeries = computed(() => {
+	if (!heatmap.data) return []
+	let series = heatmap.data.heatmap_data.map((row) => {
+		return {
+			name: row.name,
+			data: row.data.map((value) => value.count),
+		}
+	})
+	return series
+})
+</script>
diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue
index c24c56d6..288d1244 100644
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -1,10 +1,12 @@
 <template>
-	<div class="mb-10">
-		<Button v-if="isStudent" @click="openEvalModal" class="float-right">
-			{{ __('Schedule Evaluation') }}
-		</Button>
-		<div class="text-lg font-semibold mb-4">
-			{{ __('Upcoming Evaluations') }}
+	<div>
+		<div class="flex items-center justify-between mb-4">
+			<div class="text-lg font-semibold">
+				{{ __('Upcoming Evaluations') }}
+			</div>
+			<Button @click="openEvalModal">
+				{{ __('Schedule Evaluation') }}
+			</Button>
 		</div>
 		<div v-if="upcoming_evals.data?.length">
 			<div class="grid grid-cols-2 gap-4">
@@ -67,10 +69,6 @@ const props = defineProps({
 		type: Array,
 		default: [],
 	},
-	isStudent: {
-		type: Boolean,
-		default: false,
-	},
 	endDate: {
 		type: String,
 		default: null,
diff --git a/frontend/src/pages/Badge.vue b/frontend/src/pages/Badge.vue
index c2980da0..976104a8 100644
--- a/frontend/src/pages/Badge.vue
+++ b/frontend/src/pages/Badge.vue
@@ -1,32 +1,33 @@
 <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.title }}
+				{{ badge.data.badge }}
 			</div>
-			<img :src="badge.doc.image" :alt="badge.doc.title" class="h-60 mt-2" />
-			<div class="text-lg">
+			<img
+				:src="badge.data.badge_image"
+				:alt="badge.data.badge"
+				class="h-60 mt-2"
+			/>
+			<div class="">
 				{{
 					__('This badge has been awarded to {0} on {1}.').format(
-						userName,
-						dayjs(issuedOn.data?.issued_on).format('DD MMM YYYY')
+						badge.data.member_name,
+						dayjs(badge.data.issued_on).format('DD MMM YYYY')
 					)
 				}}
 			</div>
-			<div class="text-lg mt-2">
-				{{ badge.doc.description }}
+			<div class="mt-2">
+				{{ badge.data.badge_description }}
 			</div>
 		</div>
 	</div>
 </template>
 <script setup>
-import { createDocumentResource, createResource, Breadcrumbs } from 'frappe-ui'
+import { createDocumentResource, createResource } from 'frappe-ui'
 import { computed, inject } from 'vue'
-import { useRouter } from 'vue-router'
 
-const allUsers = inject('$allUsers')
 const dayjs = inject('$dayjs')
-const router = useRouter()
 
 const props = defineProps({
 	badgeName: {
@@ -39,33 +40,15 @@ const props = defineProps({
 	},
 })
 
-const badge = createDocumentResource({
-	doctype: 'LMS Badge',
-	name: props.badgeName,
-})
-
-const userName = computed(() => {
-	const user = Object.values(allUsers.data).find(
-		(user) => user.name === props.email
-	)
-	return user ? user.full_name : props.email
-})
-
-const issuedOn = createResource({
-	url: 'frappe.client.get_value',
+const badge = createResource({
+	url: 'frappe.client.get',
 	makeParams(values) {
 		return {
 			doctype: 'LMS Badge Assignment',
 			filters: {
-				member: props.email,
 				badge: props.badgeName,
+				member: props.email,
 			},
-			fieldname: 'issued_on',
-		}
-	},
-	onSuccess(data) {
-		if (!data.issued_on) {
-			router.push({ name: 'Courses' })
 		}
 	},
 	auto: true,
@@ -77,11 +60,11 @@ const breadcrumbs = computed(() => {
 			label: 'Badges',
 		},
 		{
-			label: badge.doc.title,
+			label: badge.data.badge,
 			route: {
 				name: 'Badge',
 				params: {
-					badge: badge.doc.name,
+					badge: badge.data.badge,
 				},
 			},
 		},
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
index 511e4b2e..a1a3d5f6 100644
--- a/frontend/src/pages/Batch.vue
+++ b/frontend/src/pages/Batch.vue
@@ -89,10 +89,10 @@
 				</Tabs>
 			</div>
 			<div class="p-5">
-				<div class="text-xl font-semibold mb-2">
-					{{ batch.data.title }}
+				<div class="text-gray-700 font-semibold mb-4">
+					{{ __('About this batch') }}:
 				</div>
-				<div v-html="batch.data.description" class="leading-5 mb-2"></div>
+				<div v-html="batch.data.description" class="leading-5 mb-4"></div>
 
 				<div class="flex items-center avatar-group overlap mb-5">
 					<div
diff --git a/frontend/src/pages/Programs.vue b/frontend/src/pages/Programs.vue
index ef5137bd..8ae9e4f7 100644
--- a/frontend/src/pages/Programs.vue
+++ b/frontend/src/pages/Programs.vue
@@ -28,9 +28,7 @@
 						size="lg"
 					>
 						{{ program.members }}
-						{{
-							program.members == 1 ? __(singularize('members')) : __('members')
-						}}
+						{{ program.members == 1 ? __('member') : __('members') }}
 					</Badge>
 					<Badge
 						v-if="program.progress"
@@ -133,7 +131,7 @@ import { computed, inject, onMounted, ref } from 'vue'
 import { BookOpen, Edit, Plus, LockKeyhole } from 'lucide-vue-next'
 import CourseCard from '@/components/CourseCard.vue'
 import { useRouter } from 'vue-router'
-import { showToast, singularize } from '@/utils'
+import { showToast } from '@/utils'
 import { useSettings } from '@/stores/settings'
 
 const user = inject('$user')
diff --git a/frontend/src/router.js b/frontend/src/router.js
index 5297cfc0..dc10408e 100644
--- a/frontend/src/router.js
+++ b/frontend/src/router.js
@@ -228,8 +228,7 @@ router.beforeEach(async (to, from, next) => {
 			isLoggedIn &&
 			(to.name == 'Lesson' ||
 				to.name == 'Batch' ||
-				to.name == 'Notifications' ||
-				to.name == 'Badge')
+				to.name == 'Notifications')
 		) {
 			await allUsers.promise
 		}
diff --git a/frontend/src/utils/assignment.js b/frontend/src/utils/assignment.js
index 7d9e1c47..0e10e4e9 100644
--- a/frontend/src/utils/assignment.js
+++ b/frontend/src/utils/assignment.js
@@ -66,6 +66,7 @@ export class Assignment {
 			return
 		}
 		const app = createApp(AssessmentPlugin, {
+			type: 'assignment',
 			onAddition: (assignment) => {
 				this.data.assignment = assignment
 				this.renderAssignment(assignment)
diff --git a/frontend/src/utils/quiz.js b/frontend/src/utils/quiz.js
index d636721a..f6d59b22 100644
--- a/frontend/src/utils/quiz.js
+++ b/frontend/src/utils/quiz.js
@@ -64,6 +64,7 @@ export class Quiz {
 			return
 		}
 		const app = createApp(AssessmentPlugin, {
+			type: 'quiz',
 			onAddition: (quiz) => {
 				this.data.quiz = quiz
 				this.renderQuiz(quiz)
diff --git a/frontend/src/utils/theme.js b/frontend/src/utils/theme.js
new file mode 100644
index 00000000..8566f516
--- /dev/null
+++ b/frontend/src/utils/theme.js
@@ -0,0 +1,5 @@
+import resolveConfig from 'tailwindcss/resolveConfig'
+import tailwindConfig from 'tailwind.config.js'
+
+export const config = resolveConfig(tailwindConfig)
+export const theme = config.theme
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index fe194fa2..0ed48a95 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -17,6 +17,7 @@ export default defineConfig({
 	resolve: {
 		alias: {
 			'@': path.resolve(__dirname, 'src'),
+			'tailwind.config.js': path.resolve(__dirname, 'tailwind.config.js'),
 		},
 	},
 	build: {
@@ -36,6 +37,11 @@ export default defineConfig({
 		},
 	},
 	optimizeDeps: {
-		include: ['frappe-ui > feather-icons', 'showdown', 'engine.io-client'],
+		include: [
+			'feather-icons',
+			'showdown',
+			'engine.io-client',
+			'tailwind.config.js',
+		],
 	},
 })
diff --git a/lms/__init__.py b/lms/__init__.py
index 6ebac24f..326b86ff 100644
--- a/lms/__init__.py
+++ b/lms/__init__.py
@@ -1 +1 @@
-__version__ = "2.18.0"
+__version__ = "2.19.0"
diff --git a/lms/lms/api.py b/lms/lms/api.py
index 347e3ac1..a9e2f728 100644
--- a/lms/lms/api.py
+++ b/lms/lms/api.py
@@ -13,7 +13,17 @@ from frappe.translate import get_all_translations
 from frappe import _
 from frappe.query_builder import DocType
 from frappe.query_builder.functions import Count
-from frappe.utils import time_diff, now_datetime, get_datetime, flt
+from frappe.utils import (
+	time_diff,
+	now_datetime,
+	get_datetime,
+	cint,
+	flt,
+	now,
+	add_days,
+	format_date,
+	date_diff,
+)
 from typing import Optional
 from lms.lms.utils import get_average_rating, get_lesson_count
 from xml.dom.minidom import parseString
@@ -594,7 +604,7 @@ def get_categories(doctype, filters):
 def get_members(start=0, search=""):
 	"""Get members for the given search term and start index.
 	Args: start (int): Start index for the query.
-	        search (str): Search term to filter the results.
+	                                search (str): Search term to filter the results.
 	Returns: List of members.
 	"""
 
@@ -1043,3 +1053,121 @@ def mark_lesson_progress(course, chapter_number, lesson_number):
 		"Lesson Reference", {"parent": chapter_name, "idx": lesson_number}, "lesson"
 	)
 	save_progress(lesson_name, course)
+
+
+@frappe.whitelist()
+def get_heatmap_data(member=None, base_days=200):
+	if not member:
+		member = frappe.session.user
+
+	base_date, start_date, number_of_days, days = calculate_date_ranges(base_days)
+	date_count = initialize_date_count(days)
+
+	lesson_completions, quiz_submissions, assignment_submissions = fetch_activity_data(
+		member, start_date
+	)
+	count_dates(lesson_completions, date_count)
+	count_dates(quiz_submissions, date_count)
+	count_dates(assignment_submissions, date_count)
+
+	heatmap_data, labels, total_activities, weeks = prepare_heatmap_data(
+		start_date, number_of_days, date_count
+	)
+
+	return {
+		"heatmap_data": heatmap_data,
+		"labels": labels,
+		"total_activities": total_activities,
+		"weeks": weeks,
+	}
+
+
+def calculate_date_ranges(base_days):
+	today = format_date(now(), "YYYY-MM-dd")
+	day_today = get_datetime(today).strftime("%w")
+	padding_end = 6 - cint(day_today)
+
+	base_date = add_days(today, -base_days)
+	day_of_base_date = cint(get_datetime(base_date).strftime("%w"))
+	start_date = add_days(base_date, -day_of_base_date)
+	number_of_days = base_days + day_of_base_date + padding_end
+	days = [add_days(start_date, i) for i in range(number_of_days + 1)]
+
+	return base_date, start_date, number_of_days, days
+
+
+def initialize_date_count(days):
+	return {format_date(day, "YYYY-MM-dd"): 0 for day in days}
+
+
+def fetch_activity_data(member, start_date):
+	lesson_completions = frappe.get_all(
+		"LMS Course Progress",
+		fields=["creation"],
+		filters={"member": member, "creation": [">=", start_date]},
+	)
+
+	quiz_submissions = frappe.get_all(
+		"LMS Quiz Submission",
+		fields=["creation"],
+		filters={"member": member, "creation": [">=", start_date]},
+	)
+
+	assignment_submissions = frappe.get_all(
+		"LMS Assignment Submission",
+		fields=["creation"],
+		filters={"member": member, "creation": [">=", start_date]},
+	)
+
+	return lesson_completions, quiz_submissions, assignment_submissions
+
+
+def count_dates(data, date_count):
+	for entry in data:
+		date = format_date(entry.creation, "YYYY-MM-dd")
+		if date in date_count:
+			date_count[date] += 1
+
+
+def prepare_heatmap_data(start_date, number_of_days, date_count):
+	days_of_week = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"]
+	heatmap_data = {day: [] for day in days_of_week}
+	week_count = -(number_of_days // -7)
+	labels = [None] * week_count
+	last_seen_month = None
+	sorted_dates = sorted(date_count.keys())
+
+	for date in sorted_dates:
+		activity_count = date_count[date]
+		day_of_week = get_datetime(date).strftime("%a")
+		current_month = get_datetime(date).strftime("%b")
+		column_index = get_week_difference(start_date, date)
+
+		if 0 <= column_index < week_count:
+			heatmap_data[day_of_week].append(
+				{
+					"date": date,
+					"count": activity_count,
+					"label": f"{activity_count} activities on {format_date(date, 'dd MMM')}",
+				}
+			)
+
+			if last_seen_month != current_month:
+				labels[column_index] = current_month
+				last_seen_month = current_month
+
+	for (index, label) in enumerate(labels):
+		if not label:
+			labels[index] = ""
+
+	formatted_heatmap_data = [
+		{"name": day, "data": heatmap_data[day]} for day in days_of_week
+	]
+
+	total_activities = sum(date_count.values())
+	return formatted_heatmap_data, labels, total_activities, week_count
+
+
+def get_week_difference(start_date, current_date):
+	diff_in_days = date_diff(current_date, start_date)
+	return diff_in_days // 7
diff --git a/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.js b/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.js
index 89f1e58e..9cb74c9e 100644
--- a/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.js
+++ b/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"
+			);
 	},
 });
diff --git a/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json b/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
index 78e4eae9..d51e8252 100644
--- a/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
+++ b/lms/lms/doctype/lms_badge_assignment/lms_badge_assignment.json
@@ -6,6 +6,7 @@
  "engine": "InnoDB",
  "field_order": [
   "member",
+  "member_name",
   "issued_on",
   "column_break_ugix",
   "badge",
@@ -57,11 +58,18 @@
    "label": "Badge Description",
    "read_only": 1,
    "reqd": 1
+  },
+  {
+   "fetch_from": "member.full_name",
+   "fieldname": "member_name",
+   "fieldtype": "Data",
+   "label": "Member Name",
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-05-13 20:16:00.191517",
+ "modified": "2025-01-06 12:32:28.450028",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Badge Assignment",
diff --git a/lms/lms/doctype/lms_quiz/lms_quiz.json b/lms/lms/doctype/lms_quiz/lms_quiz.json
index 4b779f27..b4c2a6d0 100644
--- a/lms/lms/doctype/lms_quiz/lms_quiz.json
+++ b/lms/lms/doctype/lms_quiz/lms_quiz.json
@@ -132,13 +132,13 @@
   },
   {
    "fieldname": "duration",
-   "fieldtype": "Duration",
-   "label": "Duration"
+   "fieldtype": "Data",
+   "label": "Duration (in minutes)"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-10-11 22:39:40.381183",
+ "modified": "2025-01-06 11:02:09.749207",
  "modified_by": "Administrator",
  "module": "LMS",
  "name": "LMS Quiz",
diff --git a/lms/lms/utils.py b/lms/lms/utils.py
index 31b82f9f..6171a164 100644
--- a/lms/lms/utils.py
+++ b/lms/lms/utils.py
@@ -1030,6 +1030,7 @@ def get_course_details(course):
 	course_details.tags = course_details.tags.split(",") if course_details.tags else []
 
 	course_details.instructors = get_instructors(course_details.name)
+	# course_details.is_instructor = is_instructor(course_details.name)
 	if course_details.paid_course:
 		"""course_details.course_price, course_details.currency = check_multicurrency(
 		        course_details.course_price, course_details.currency, None, course_details.amount_usd
@@ -1048,7 +1049,6 @@ def get_course_details(course):
 			["name", "course", "current_lesson", "progress", "member"],
 			as_dict=1,
 		)
-		course_details.is_instructor = is_instructor(course_details.name)
 
 	if course_details.membership and course_details.membership.current_lesson:
 		course_details.current_lesson = get_lesson_index(
@@ -1219,12 +1219,50 @@ def get_batches():
 	batch_list = frappe.get_all("LMS Batch", filters)
 
 	for batch in batch_list:
-		batches.append(get_batch_details(batch.name))
+		batches.append(get_batch_card_details(batch.name))
 
 	batches = categorize_batches(batches)
 	return batches
 
 
+def get_batch_card_details(batchname):
+	batch = frappe.db.get_value(
+		"LMS Batch",
+		batchname,
+		[
+			"name",
+			"title",
+			"description",
+			"seat_count",
+			"paid_batch",
+			"amount",
+			"amount_usd",
+			"currency",
+			"start_date",
+			"end_date",
+			"start_time",
+			"end_time",
+			"timezone",
+			"published",
+		],
+		as_dict=True,
+	)
+
+	batch.instructors = get_instructors(batchname)
+	students_count = frappe.db.count("Batch Student", {"parent": batchname})
+
+	if batch.seat_count:
+		batch.seats_left = batch.seat_count - students_count
+
+	if batch.paid_batch and batch.start_date >= getdate():
+		batch.amount, batch.currency = check_multicurrency(
+			batch.amount, batch.currency, None, batch.amount_usd
+		)
+		batch.price = fmt_money(batch.amount, 0, batch.currency)
+
+	return batch
+
+
 @frappe.whitelist(allow_guest=True)
 def get_batch_details(batch):
 	batch_details = frappe.db.get_value(
@@ -1499,7 +1537,7 @@ def get_batch_students(batch):
 			detail.progress = 0
 
 		students.append(detail)
-
+		students = sorted(students, key=lambda x: x.progress, reverse=True)
 	return students
 
 
@@ -1750,31 +1788,31 @@ def enroll_in_batch(batch, payment_name=None):
 	if not frappe.db.exists(
 		"Batch Student", {"parent": batch, "student": frappe.session.user}
 	):
-		student = frappe.new_doc("Batch Student")
-		current_count = frappe.db.count("Batch Student", {"parent": batch})
+		batch_doc = frappe.get_doc("LMS Batch", batch)
+		if batch_doc.seat_count and len(batch_doc.students) >= batch_doc.seat_count:
+			frappe.throw(_("The batch is full. Please contact the Administrator."))
 
-		student.update(
-			{
-				"student": frappe.session.user,
-				"parent": batch,
-				"parenttype": "LMS Batch",
-				"parentfield": "students",
-				"idx": current_count + 1,
-			}
-		)
+		new_student = {
+			"student": frappe.session.user,
+			"parent": batch,
+			"parenttype": "LMS Batch",
+			"parentfield": "students",
+			"idx": len(batch_doc.students) + 1,
+		}
 
 		if payment_name:
 			payment = frappe.db.get_value(
 				"LMS Payment", payment_name, ["name", "source"], as_dict=True
 			)
-			student.update(
+			new_student.update(
 				{
 					"payment": payment.name,
 					"source": payment.source,
 				}
 			)
 
-		student.save(ignore_permissions=True)
+		batch_doc.append("students", new_student)
+		batch_doc.save(ignore_permissions=True)
 
 
 @frappe.whitelist()
diff --git a/lms/locale/ar.po b/lms/locale/ar.po
index 527e57ba..be4647b3 100644
--- a/lms/locale/ar.po
+++ b/lms/locale/ar.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -393,6 +397,8 @@ msgstr "عين"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "تعيينات"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr "تغيير"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "التحقق من"
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -805,7 +823,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -814,12 +832,16 @@ msgstr ""
 msgid "City"
 msgstr "مدينة"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "واضح"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "اللون"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "اللون"
 msgid "Comments"
 msgstr "تعليقات"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr "أكتمل"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "عقد"
@@ -1045,7 +1072,7 @@ msgstr "عقد"
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "أنشأ"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "تفاصيل"
 
@@ -1619,6 +1650,10 @@ msgstr "إرسال البريد الإلكتروني"
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "خطأ"
@@ -1919,7 +1956,7 @@ msgstr ""
 msgid "Featured"
 msgstr "متميز"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "نوع الملف"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "الاسم الكامل"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "هوية شخصية"
 
@@ -2178,7 +2224,7 @@ msgstr "هوية شخصية"
 msgid "Icon"
 msgstr "أيقونة"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "المسمى الوظيفي"
 msgid "Jobs"
 msgstr "وظائف"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "انضم"
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "الموقع"
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "متوسط:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "عدل من قبل"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جديد"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "{0} جديد"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "التالي"
 
@@ -3244,7 +3298,7 @@ msgstr "التالي"
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr "لا يسمح"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "يرجى التحقق من بريدك الالكتروني للتحقق"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr "نشرت في"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "تقييم"
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "السبت"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "حفظ"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "البحث"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "بداية"
@@ -4664,6 +4735,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr "موضوع"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "نجاح"
 
@@ -4809,7 +4889,7 @@ msgstr "ملخص"
 msgid "Sunday"
 msgstr "الأحد"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "نص"
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "إلى"
 msgid "To Date"
 msgstr "إلى تاريخ"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr "السفر"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr "النوع"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr "تحميل"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5404,7 +5504,7 @@ msgstr "الأربعاء"
 msgid "Welcome to {0}!"
 msgstr "أهلا وسهلا بك إلى {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/bs.po b/lms/locale/bs.po
index eb9bc3b5..00c283a4 100644
--- a/lms/locale/bs.po
+++ b/lms/locale/bs.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Bosnian\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -393,6 +397,8 @@ msgstr ""
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Dodjele"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr "Promjeni"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Provjeri"
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -805,7 +823,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr "Odaberi ikonu"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -814,12 +832,16 @@ msgstr ""
 msgid "City"
 msgstr "Grad"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Očisti"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Boja"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Boja"
 msgid "Comments"
 msgstr "Komentari"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr "Završeno"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1045,7 +1072,7 @@ msgstr ""
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Kreirano"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Detalji"
 
@@ -1619,6 +1650,10 @@ msgstr "E-pošta poslana"
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Grеška"
@@ -1919,7 +1956,7 @@ msgstr "Neuspjeh"
 msgid "Featured"
 msgstr "Istaknuto"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "Vrsta datoteke"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Puno ime"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Google Meet veza"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "ID"
 
@@ -2178,7 +2224,7 @@ msgstr "ID"
 msgid "Icon"
 msgstr "Ikona"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr ""
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr ""
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Srednje:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "Izmijenio"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Novi {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Sljedeći"
 
@@ -3244,7 +3298,7 @@ msgstr "Sljedeći"
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr "Nije dozvoljeno"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "Molimo provjerite svoju e-poštu za potvrdu"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr "Objavljeno dana"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr ""
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr ""
@@ -4664,6 +4735,7 @@ msgstr "Statistika"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr ""
 
@@ -4809,7 +4889,7 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Tekst"
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Pokušaj ponovo"
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr "Učitaj"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5404,7 +5504,7 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/de.po b/lms/locale/de.po
index 1d90cc22..6f5b2228 100644
--- a/lms/locale/de.po
+++ b/lms/locale/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr "Fügen Sie mindestens eine mögliche Antwort für diese Frage hinzu: {0}
 msgid "Add web page to sidebar"
 msgstr "Webseite zur Seitenleiste hinzufügen"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Aufgabe als {0} hinzufügen"
 
@@ -393,6 +397,8 @@ msgstr "Zuweisen"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "Vorlage für Aufgabeneinreichung"
 msgid "Assignment Title"
 msgstr "Aufgabentitel"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Die Aufgabe für Lektion {0} von {1} existiert bereits."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Die Aufgabe wird unten in der Lektion angezeigt."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Zuordnungen"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Bei dieser Frage muss mindestens eine Antwortmöglichkeit richtig sein."
@@ -746,6 +760,10 @@ msgstr "Zertifizierte Teilnehmer"
 msgid "Change"
 msgstr "Ändern"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr "Kapitel"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Prüfen"
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr "Auswahlmöglichkeiten"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Wählen Sie alle zutreffenden Antworten aus"
 
@@ -805,7 +823,7 @@ msgstr "Wählen Sie alle zutreffenden Antworten aus"
 msgid "Choose an icon"
 msgstr "Symbol auswählen"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Wählen Sie eine Antwort"
 
@@ -814,12 +832,16 @@ msgstr "Wählen Sie eine Antwort"
 msgid "City"
 msgstr "Ort"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Löschen"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Farbe"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Farbe"
 msgid "Comments"
 msgstr "Kommentare"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Vertrag"
@@ -1045,7 +1072,7 @@ msgstr "Vertrag"
 msgid "Cookie Policy"
 msgstr "Cookie-Richtlinie"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "Kursliste"
 msgid "Course Name"
 msgstr "Kursname"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Erstellt"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Details"
 
@@ -1619,6 +1650,10 @@ msgstr "E-Mail wurde versandt"
 msgid "Email Templates"
 msgstr "E-Mail-Vorlagen"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Eingeschriebene Studenten"
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr "Anzahl der Einschreibungen"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr "Einschreibungen"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "Geben Sie die Client-Id und das Client-Geheimnis in den Google-Einstellungen ein, um Kalendereinladungen für Bewertungen zu versenden."
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "Gib eine URL ein"
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Geben Sie die richtige Antwort ein"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "Geben Sie die richtige Antwort ein"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Fehler"
@@ -1919,7 +1956,7 @@ msgstr "Fehler"
 msgid "Featured"
 msgstr "Vorgestellt"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "Bei Bedarf können Sie Änderungen an Ihrer Einreichung vornehmen."
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "Dateityp"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "Frei"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Vollständiger Name"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Vollzeit"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Google Meet-Link"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Stufe"
@@ -2083,6 +2125,10 @@ msgstr "Notenvergabe"
 msgid "Grade Type"
 msgstr "Notentyp"
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "Hinweise"
 msgid "Host"
 msgstr "Gastgeber"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "Ich bin nicht verfügbar"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "ID"
 
@@ -2178,7 +2224,7 @@ msgstr "ID"
 msgid "Icon"
 msgstr "Symbol"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr "Unvollständig"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "Stellenbezeichnung"
 msgid "Jobs"
 msgstr "freie Stellen"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "Beitreten"
@@ -2759,7 +2805,7 @@ msgstr "Titel der Unterrichtseinheit"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "Ort"
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "Als gelesen markieren"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Mittel:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "Geändert von"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "Mein Kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Neu"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Neu {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Weiter"
 
@@ -3244,7 +3298,7 @@ msgstr "Weiter"
 msgid "Next Question"
 msgstr "Nächste Frage"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr "Keine bevorstehenden Bewertungen"
 msgid "No announcements"
 msgstr "Keine Ankündigungen"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr "Keine Kurse in Überprüfung"
 msgid "No introduction"
 msgstr "Keine Einführung"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "Keine Stellen ausgeschrieben"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Keine Live-Kurse geplant"
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr "Für dieses Datum sind keine Plätze verfügbar."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "Keine bevorstehenden Bewertungen."
@@ -3361,6 +3423,7 @@ msgstr "Nicht bewertet"
 msgid "Not Permitted"
 msgstr "Nicht zulässig"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "Offline"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "Nochmals herzlichen Glückwunsch zu dieser bedeutenden Leistung."
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "Sobald der Moderator Ihren Beitrag bewertet hat, finden Sie hier die Details."
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Es werden nur Dateien vom Typ {0} akzeptiert."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Teilzeit"
@@ -3681,7 +3744,7 @@ msgstr "Prozentsatz (z. B. 70 %)"
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "Bitte überprüfen Sie Ihren Posteingang. Wir haben Ihnen eine E-Mail mi
 msgid "Please click on the following button to set your new password"
 msgstr "Bitte klicken Sie auf die folgende Schaltfläche, um Ihr neues Passwort festzulegen"
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "Bitte geben Sie eine gültige URL ein."
 
@@ -3730,7 +3793,7 @@ msgstr "Bitte geben Sie eine gültige URL ein."
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "Bitte geben Sie die URL zur Aufgabeneinreichung ein."
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "Bitte melden Sie sich an, um auf das Quiz zuzugreifen."
@@ -3758,7 +3825,7 @@ msgstr "Bitte melden Sie sich an, um auf das Quiz zuzugreifen."
 msgid "Please login to access this page."
 msgstr "Bitte melden Sie sich an, um auf diese Seite zuzugreifen."
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "Bitte loggen Sie sich ein, um mit der Zahlung fortzufahren."
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr "Veröffentlicht am"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr "Frage {0}"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "Frage {0} von {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "Frage {0} von {1}"
 msgid "Questions"
 msgstr "Fragen"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr "Quiz-Einreichung"
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr "Quiz-Zusammenfassung"
 
@@ -4088,7 +4155,7 @@ msgstr "Quiz-Zusammenfassung"
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Das Quiz ist für Gastbenutzer nicht verfügbar. Bitte melden Sie sich an, um fortzufahren."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Das Quiz wird am Ende der Lektion angezeigt."
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Bewertung"
 msgid "Rating cannot be 0"
 msgstr "Bewertung kann nicht 0 sein"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "Lesen Sie die Frage sorgfältig durch, bevor Sie die Aufgabe bearbeiten."
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Samstag"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Speichern"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "Suchen"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr "Mitarbeiter"
 msgid "Stage"
 msgstr "Stufe"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "Starten"
@@ -4664,6 +4735,7 @@ msgstr "Statistiken"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr "Schüler"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr "Untergruppe"
 msgid "Subject"
 msgstr "Betreff"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr "Einreichung"
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "Erfolg"
 
@@ -4809,7 +4889,7 @@ msgstr "Zusammenfassung"
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Text"
 msgid "Thanks and Regards"
 msgstr "Danke und Grüße"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr "Dieses Zertifikat läuft nicht ab"
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "Dieser Kurs ist kostenlos."
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "An"
 msgid "To Date"
 msgstr "Bis-Datum"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr "Um dieser Gruppe beizutreten, wenden Sie sich bitte an den Administrator."
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr "Gesamte Registrierungen"
 msgid "Travel"
 msgstr "Reise"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Erneut versuchen"
 
@@ -5191,6 +5289,8 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Typ"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr "Passwort ändern"
 msgid "Upload"
 msgstr "Hochladen"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "Datei hochladen"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "Hochladen {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "Mittwoch"
 msgid "Welcome to {0}!"
 msgstr "Willkommen auf {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr "Eine Rezension schreiben"
 msgid "Write a review"
 msgstr "Eine Rezension schreiben"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "Schreiben Sie hier Ihre Antwort"
 
@@ -5461,11 +5561,11 @@ msgstr "Schreiben Sie hier Ihre Antwort"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "Sie sind bereits in diesem Kurs eingeschrieben."
 
@@ -5530,7 +5630,7 @@ msgstr "Sie haben keine Benachrichtigungen."
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "Sie haben {0}% richtige Antworten mit einer Punktzahl von {1} von {2}"
@@ -5551,7 +5651,7 @@ msgstr "Sie haben diesen Kurs bereits bewertet"
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr "Sie haben sich für eine Benachrichtigung zu diesem Kurs entschieden. Si
 msgid "You haven't enrolled for any courses"
 msgstr "Sie haben sich für keinen Kurs angemeldet"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr "Sie müssen {0}% der Fragen richtig beantworten, um das Quiz zu bestehen
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "Sie haben sich als Mentor für diesen Kurs beworben. Ihre Anfrage wird derzeit geprüft."
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "Sie haben die Aufgabe erfolgreich eingereicht."
 
@@ -5628,7 +5732,7 @@ msgstr "Ihre Anfrage zur Mitarbeit als Mentor/in im Kurs"
 msgid "Your score is"
 msgstr "Ihr Ergebnis ist"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr "von"
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr "Sie können"
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/eo.po b/lms/locale/eo.po
index 5f5057ca..105d08ef 100644
--- a/lms/locale/eo.po
+++ b/lms/locale/eo.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Esperanto\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr "crwdns151728:0crwdne151728:0"
 msgid "Add a new question"
 msgstr "crwdns149228:0crwdne149228:0"
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr "crwdns149230:0crwdne149230:0"
 
@@ -164,6 +164,10 @@ msgstr "crwdns149230:0crwdne149230:0"
 msgid "Add an assessment"
 msgstr "crwdns149232:0crwdne149232:0"
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr "crwdns152104:0crwdne152104:0"
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr "crwdns149234:0crwdne149234:0"
@@ -176,7 +180,7 @@ msgstr "crwdns149236:0{0}crwdne149236:0"
 msgid "Add web page to sidebar"
 msgstr "crwdns149238:0crwdne149238:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "crwdns149240:0{0}crwdne149240:0"
 
@@ -393,6 +397,8 @@ msgstr "crwdns149312:0crwdne149312:0"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "crwdns149318:0crwdne149318:0"
 msgid "Assignment Title"
 msgstr "crwdns149320:0crwdne149320:0"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "crwdns149322:0{0}crwdnd149322:0{1}crwdne149322:0"
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr "crwdns152106:0crwdne152106:0"
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "crwdns149324:0crwdne149324:0"
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "crwdns152108:0crwdne152108:0"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "crwdns149326:0crwdne149326:0"
@@ -746,6 +760,10 @@ msgstr "crwdns149438:0crwdne149438:0"
 msgid "Change"
 msgstr "crwdns149440:0crwdne149440:0"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr "crwdns152110:0crwdne152110:0"
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr "crwdns151622:0crwdne151622:0"
 msgid "Chapters"
 msgstr "crwdns149446:0crwdne149446:0"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "crwdns149448:0crwdne149448:0"
 
@@ -797,7 +815,7 @@ msgstr "crwdns149454:0crwdne149454:0"
 msgid "Choices"
 msgstr "crwdns149456:0crwdne149456:0"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "crwdns149458:0crwdne149458:0"
 
@@ -805,7 +823,7 @@ msgstr "crwdns149458:0crwdne149458:0"
 msgid "Choose an icon"
 msgstr "crwdns149460:0crwdne149460:0"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "crwdns149462:0crwdne149462:0"
 
@@ -814,12 +832,16 @@ msgstr "crwdns149462:0crwdne149462:0"
 msgid "City"
 msgstr "crwdns149464:0crwdne149464:0"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "crwdns152112:0crwdne152112:0"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr "crwdns149466:0crwdne149466:0"
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr "crwdns149468:0crwdne149468:0"
 
@@ -917,6 +939,7 @@ msgstr "crwdns149498:0crwdne149498:0"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "crwdns149498:0crwdne149498:0"
 msgid "Comments"
 msgstr "crwdns149500:0crwdne149500:0"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr "crwdns152114:0crwdne152114:0"
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "crwdns149518:0crwdne149518:0"
 msgid "Completed"
 msgstr "crwdns149520:0crwdne149520:0"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr "crwdns152082:0crwdne152082:0"
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr "crwdns149540:0crwdne149540:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "crwdns149542:0crwdne149542:0"
@@ -1045,7 +1072,7 @@ msgstr "crwdns149542:0crwdne149542:0"
 msgid "Cookie Policy"
 msgstr "crwdns149544:0crwdne149544:0"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr "crwdns149546:0crwdne149546:0"
 
@@ -1057,7 +1084,7 @@ msgstr "crwdns149548:0crwdne149548:0"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "crwdns149578:0crwdne149578:0"
 msgid "Course Name"
 msgstr "crwdns149580:0crwdne149580:0"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr "crwdns151624:0crwdne151624:0"
 
@@ -1322,6 +1349,10 @@ msgstr "crwdns151738:0crwdne151738:0"
 msgid "Create a new question"
 msgstr "crwdns149616:0crwdne149616:0"
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "crwdns152116:0crwdne152116:0"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr "crwdns149652:0crwdne149652:0"
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "crwdns149654:0crwdne149654:0"
 
@@ -1619,6 +1650,10 @@ msgstr "crwdns149700:0crwdne149700:0"
 msgid "Email Templates"
 msgstr "crwdns149702:0crwdne149702:0"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr "crwdns152118:0crwdne152118:0"
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr "crwdns149722:0crwdne149722:0"
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "crwdns149724:0crwdne149724:0"
 
@@ -1717,7 +1752,7 @@ msgstr "crwdns149728:0crwdne149728:0"
 msgid "Enrollment Count"
 msgstr "crwdns149730:0crwdne149730:0"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr "crwdns149732:0crwdne149732:0"
 
@@ -1733,7 +1768,7 @@ msgstr "crwdns149734:0crwdne149734:0"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "crwdns149736:0crwdne149736:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "crwdns149738:0crwdne149738:0"
 
@@ -1745,6 +1780,7 @@ msgstr "crwdns149740:0crwdne149740:0"
 msgid "Enter the correct answer"
 msgstr "crwdns149742:0crwdne149742:0"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "crwdns149742:0crwdne149742:0"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "crwdns149744:0crwdne149744:0"
@@ -1919,7 +1956,7 @@ msgstr "crwdns149788:0crwdne149788:0"
 msgid "Featured"
 msgstr "crwdns149790:0crwdne149790:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "crwdns149792:0crwdne149792:0"
 
@@ -1938,6 +1975,10 @@ msgstr "crwdns149796:0crwdne149796:0"
 msgid "File Type"
 msgstr "crwdns149798:0crwdne149798:0"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr "crwdns152120:0crwdne152120:0"
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr "crwdns149802:0crwdne149802:0"
 msgid "Flexible Time"
 msgstr "crwdns149804:0crwdne149804:0"
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr "crwdns149806:0crwdne149806:0"
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "crwdns149810:0crwdne149810:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "crwdns149812:0crwdne149812:0"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "crwdns149824:0crwdne149824:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "crwdns149826:0crwdne149826:0"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "crwdns149844:0crwdne149844:0"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "crwdns149846:0crwdne149846:0"
@@ -2083,6 +2125,10 @@ msgstr "crwdns149848:0crwdne149848:0"
 msgid "Grade Type"
 msgstr "crwdns149850:0crwdne149850:0"
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr "crwdns152122:0crwdne152122:0"
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "crwdns149878:0crwdne149878:0"
 msgid "Host"
 msgstr "crwdns149880:0crwdne149880:0"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr "crwdns149882:0crwdne149882:0"
 
@@ -2168,7 +2214,7 @@ msgstr "crwdns149892:0crwdne149892:0"
 msgid "I am unavailable"
 msgstr "crwdns149894:0crwdne149894:0"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "crwdns149896:0crwdne149896:0"
 
@@ -2178,7 +2224,7 @@ msgstr "crwdns149896:0crwdne149896:0"
 msgid "Icon"
 msgstr "crwdns149898:0crwdne149898:0"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr "crwdns151474:0crwdne151474:0"
 
@@ -2261,7 +2307,7 @@ msgstr "crwdns149922:0crwdne149922:0"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "crwdns149992:0crwdne149992:0"
 msgid "Jobs"
 msgstr "crwdns149994:0crwdne149994:0"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "crwdns149996:0crwdne149996:0"
@@ -2759,7 +2805,7 @@ msgstr "crwdns150084:0crwdne150084:0"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr "crwdns150110:0crwdne150110:0"
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "crwdns150118:0crwdne150118:0"
 msgid "Location Preference"
 msgstr "crwdns150120:0crwdne150120:0"
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "crwdns150142:0crwdne150142:0"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "crwdns150158:0crwdne150158:0"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr "crwdns150196:0crwdne150196:0"
 msgid "Modified By"
 msgstr "crwdns150198:0crwdne150198:0"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr "crwdns150200:0crwdne150200:0"
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr "crwdns150202:0crwdne150202:0"
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "crwdns150212:0crwdne150212:0"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "crwdns150214:0crwdne150214:0"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr "crwdns152124:0crwdne152124:0"
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr "crwdns150216:0crwdne150216:0"
 
@@ -3214,7 +3268,7 @@ msgstr "crwdns151764:0crwdne151764:0"
 msgid "New Question"
 msgstr "crwdns150226:0crwdne150226:0"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr "crwdns150228:0crwdne150228:0"
@@ -3236,7 +3290,7 @@ msgstr "crwdns150234:0{0}crwdnd150234:0{1}crwdne150234:0"
 msgid "New {0}"
 msgstr "crwdns150236:0{0}crwdne150236:0"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "crwdns150238:0crwdne150238:0"
 
@@ -3244,7 +3298,7 @@ msgstr "crwdns150238:0crwdne150238:0"
 msgid "Next Question"
 msgstr "crwdns150240:0crwdne150240:0"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr "crwdns150242:0crwdne150242:0"
 
@@ -3265,6 +3319,10 @@ msgstr "crwdns150248:0crwdne150248:0"
 msgid "No announcements"
 msgstr "crwdns150250:0crwdne150250:0"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr "crwdns152126:0crwdne152126:0"
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr "crwdns151478:0crwdne151478:0"
@@ -3293,11 +3351,11 @@ msgstr "crwdns150256:0crwdne150256:0"
 msgid "No introduction"
 msgstr "crwdns150258:0crwdne150258:0"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "crwdns150260:0crwdne150260:0"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "crwdns150262:0crwdne150262:0"
 
@@ -3313,6 +3371,10 @@ msgstr "crwdns151592:0crwdne151592:0"
 msgid "No slots available for this date."
 msgstr "crwdns150264:0crwdne150264:0"
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr "crwdns152128:0crwdne152128:0"
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "crwdns150266:0crwdne150266:0"
@@ -3361,6 +3423,7 @@ msgstr "crwdns150284:0crwdne150284:0"
 msgid "Not Permitted"
 msgstr "crwdns150286:0crwdne150286:0"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "crwdns150300:0crwdne150300:0"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "crwdns150302:0crwdne150302:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "crwdns150304:0crwdne150304:0"
 
@@ -3421,7 +3484,7 @@ msgstr "crwdns151770:0crwdne151770:0"
 msgid "Only files of type {0} will be accepted."
 msgstr "crwdns150308:0{0}crwdne150308:0"
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr "crwdns150310:0crwdne150310:0"
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr "crwdns150356:0crwdne150356:0"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "crwdns150358:0crwdne150358:0"
@@ -3681,7 +3744,7 @@ msgstr "crwdns150394:0crwdne150394:0"
 msgid "Phone Number"
 msgstr "crwdns150396:0crwdne150396:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr "crwdns150398:0crwdne150398:0"
 
@@ -3701,7 +3764,7 @@ msgstr "crwdns150404:0crwdne150404:0"
 msgid "Please click on the following button to set your new password"
 msgstr "crwdns150406:0crwdne150406:0"
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "crwdns151772:0crwdne151772:0"
 
@@ -3721,8 +3784,8 @@ msgstr "crwdns150410:0{0}crwdne150410:0"
 msgid "Please enter a title."
 msgstr "crwdns151774:0crwdne151774:0"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "crwdns150412:0crwdne150412:0"
 
@@ -3730,7 +3793,7 @@ msgstr "crwdns150412:0crwdne150412:0"
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "crwdns151776:0crwdne151776:0"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "crwdns150414:0crwdne150414:0"
 
@@ -3750,6 +3813,10 @@ msgstr "crwdns150420:0crwdne150420:0"
 msgid "Please let us know where you heard about us from."
 msgstr "crwdns150422:0crwdne150422:0"
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr "crwdns152130:0crwdne152130:0"
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "crwdns150424:0crwdne150424:0"
@@ -3758,7 +3825,7 @@ msgstr "crwdns150424:0crwdne150424:0"
 msgid "Please login to access this page."
 msgstr "crwdns150426:0crwdne150426:0"
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "crwdns150428:0crwdne150428:0"
 
@@ -3795,7 +3862,7 @@ msgstr "crwdns150432:0{0}crwdne150432:0"
 msgid "Please upload a SCORM package"
 msgstr "crwdns151646:0crwdne151646:0"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "crwdns150434:0crwdne150434:0"
 
@@ -4003,9 +4070,9 @@ msgstr "crwdns150500:0crwdne150500:0"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr "crwdns150512:0crwdne150512:0"
 msgid "Question {0}"
 msgstr "crwdns150514:0{0}crwdne150514:0"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "crwdns150516:0{0}crwdnd150516:0{1}crwdne150516:0"
 
@@ -4051,7 +4118,7 @@ msgstr "crwdns150516:0{0}crwdnd150516:0{1}crwdne150516:0"
 msgid "Questions"
 msgstr "crwdns150518:0crwdne150518:0"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr "crwdns150520:0crwdne150520:0"
 
@@ -4079,7 +4146,7 @@ msgstr "crwdns150526:0crwdne150526:0"
 msgid "Quiz Submissions"
 msgstr "crwdns150528:0crwdne150528:0"
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr "crwdns150530:0crwdne150530:0"
 
@@ -4088,7 +4155,7 @@ msgstr "crwdns150530:0crwdne150530:0"
 msgid "Quiz Title"
 msgstr "crwdns150532:0crwdne150532:0"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr "crwdns150534:0crwdne150534:0"
 
@@ -4096,7 +4163,7 @@ msgstr "crwdns150534:0crwdne150534:0"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "crwdns150536:0crwdne150536:0"
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr "crwdns150538:0crwdne150538:0"
 
@@ -4105,7 +4172,7 @@ msgstr "crwdns150538:0crwdne150538:0"
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "crwdns150540:0crwdne150540:0"
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr "crwdns150542:0crwdne150542:0"
@@ -4113,7 +4180,7 @@ msgstr "crwdns150542:0crwdne150542:0"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "crwdns150544:0crwdne150544:0"
 msgid "Rating cannot be 0"
 msgstr "crwdns150546:0crwdne150546:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "crwdns150548:0crwdne150548:0"
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr "crwdns151652:0crwdne151652:0"
 msgid "Saturday"
 msgstr "crwdns150610:0crwdne150610:0"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "crwdns150612:0crwdne150612:0"
@@ -4359,6 +4422,10 @@ msgstr "crwdns150624:0crwdne150624:0"
 msgid "Search"
 msgstr "crwdns150626:0crwdne150626:0"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr "crwdns152132:0crwdne152132:0"
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr "crwdns150628:0crwdne150628:0"
@@ -4384,7 +4451,7 @@ msgstr "crwdns150634:0crwdne150634:0"
 msgid "Select a question"
 msgstr "crwdns150636:0crwdne150636:0"
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr "crwdns150638:0crwdne150638:0"
 
@@ -4392,6 +4459,10 @@ msgstr "crwdns150638:0crwdne150638:0"
 msgid "Select a slot"
 msgstr "crwdns150640:0crwdne150640:0"
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr "crwdns152134:0crwdne152134:0"
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr "crwdns150708:0crwdne150708:0"
 msgid "Stage"
 msgstr "crwdns150710:0crwdne150710:0"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "crwdns150712:0crwdne150712:0"
@@ -4664,6 +4735,7 @@ msgstr "crwdns150732:0crwdne150732:0"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "crwdns150746:0{0}crwdne150746:0"
 msgid "Students"
 msgstr "crwdns150748:0crwdne150748:0"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr "crwdns150750:0crwdne150750:0"
 
@@ -4746,19 +4818,24 @@ msgstr "crwdns150754:0crwdne150754:0"
 msgid "Subject"
 msgstr "crwdns150756:0crwdne150756:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr "crwdns150758:0crwdne150758:0"
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr "crwdns150760:0crwdne150760:0"
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr "crwdns152136:0crwdne152136:0"
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr "crwdns150764:0crwdne150764:0"
 msgid "Submitted {0}"
 msgstr "crwdns150766:0{0}crwdne150766:0"
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr "crwdns150766:0{0}crwdne150766:0"
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "crwdns150768:0crwdne150768:0"
 
@@ -4809,7 +4889,7 @@ msgstr "crwdns150770:0crwdne150770:0"
 msgid "Sunday"
 msgstr "crwdns150772:0crwdne150772:0"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr "crwdns151930:0{0}crwdnd151930:0{1}crwdne151930:0"
 
@@ -4924,6 +5004,10 @@ msgstr "crwdns150792:0crwdne150792:0"
 msgid "Thanks and Regards"
 msgstr "crwdns150794:0crwdne150794:0"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr "crwdns152138:0crwdne152138:0"
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "crwdns150796:0{0}crwdnd150796:0{1}crwdne150796:0"
@@ -4964,14 +5048,22 @@ msgstr "crwdns151798:0crwdne151798:0"
 msgid "There are no seats available in this batch."
 msgstr "crwdns150808:0crwdne150808:0"
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "crwdns150810:0crwdne150810:0"
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr "crwdns152140:0crwdne152140:0"
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "crwdns150812:0{0}crwdne150812:0"
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr "crwdns152142:0{0}crwdne152142:0"
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr "crwdns151850:0{0}crwdnd151850:0{1}crwdne151850:0"
@@ -4991,11 +5083,15 @@ msgstr "crwdns150816:0{0}crwdnd150816:0{1}crwdne150816:0"
 msgid "This certificate does no expire"
 msgstr "crwdns150818:0crwdne150818:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr "crwdns152144:0crwdne152144:0"
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr "crwdns150820:0crwdne150820:0"
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "crwdns150822:0crwdne150822:0"
 
@@ -5098,10 +5194,12 @@ msgstr "crwdns150848:0crwdne150848:0"
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "crwdns150852:0crwdne150852:0"
 msgid "To Date"
 msgstr "crwdns150854:0crwdne150854:0"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr "crwdns150858:0crwdne150858:0"
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr "crwdns150860:0crwdne150860:0"
 
@@ -5169,7 +5267,7 @@ msgstr "crwdns150868:0crwdne150868:0"
 msgid "Travel"
 msgstr "crwdns150870:0crwdne150870:0"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "crwdns150872:0crwdne150872:0"
 
@@ -5191,6 +5289,8 @@ msgstr "crwdns150876:0crwdne150876:0"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "crwdns150876:0crwdne150876:0"
 msgid "Type"
 msgstr "crwdns150878:0crwdne150878:0"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr "crwdns150880:0crwdne150880:0"
 
@@ -5282,11 +5382,11 @@ msgstr "crwdns150908:0crwdne150908:0"
 msgid "Upload"
 msgstr "crwdns151498:0crwdne151498:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "crwdns150910:0crwdne150910:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "crwdns150912:0{0}crwdne150912:0"
 
@@ -5404,7 +5504,7 @@ msgstr "crwdns150954:0crwdne150954:0"
 msgid "Welcome to {0}!"
 msgstr "crwdns150956:0{0}crwdne150956:0"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "crwdns151500:0crwdne151500:0"
 
@@ -5453,7 +5553,7 @@ msgstr "crwdns150972:0crwdne150972:0"
 msgid "Write a review"
 msgstr "crwdns150974:0crwdne150974:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "crwdns150976:0crwdne150976:0"
 
@@ -5461,11 +5561,11 @@ msgstr "crwdns150976:0crwdne150976:0"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "crwdns150978:0{0}crwdnd150978:0{1}crwdnd150978:0{2}crwdne150978:0"
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr "crwdns150980:0crwdne150980:0"
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "crwdns150982:0crwdne150982:0"
 
@@ -5530,7 +5630,7 @@ msgstr "crwdns151002:0crwdne151002:0"
 msgid "You got"
 msgstr "crwdns151004:0crwdne151004:0"
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "crwdns151006:0{0}crwdnd151006:0{1}crwdnd151006:0{2}crwdne151006:0"
@@ -5551,7 +5651,7 @@ msgstr "crwdns151012:0crwdne151012:0"
 msgid "You have been enrolled in this batch"
 msgstr "crwdns151014:0crwdne151014:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr "crwdns151016:0crwdne151016:0"
 
@@ -5559,6 +5659,10 @@ msgstr "crwdns151016:0crwdne151016:0"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "crwdns151852:0{0}crwdnd151852:0{1}crwdne151852:0"
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr "crwdns152146:0crwdne152146:0"
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr "crwdns151594:0crwdne151594:0"
@@ -5571,7 +5675,7 @@ msgstr "crwdns151018:0crwdne151018:0"
 msgid "You haven't enrolled for any courses"
 msgstr "crwdns151020:0crwdne151020:0"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr "crwdns151022:0crwdne151022:0"
 
@@ -5584,7 +5688,7 @@ msgstr "crwdns151024:0{0}crwdne151024:0"
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "crwdns151026:0crwdne151026:0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "crwdns151028:0crwdne151028:0"
 
@@ -5628,7 +5732,7 @@ msgstr "crwdns151044:0crwdne151044:0"
 msgid "Your score is"
 msgstr "crwdns151046:0crwdne151046:0"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr "crwdns151048:0crwdne151048:0"
 
@@ -5677,7 +5781,7 @@ msgstr "crwdns151066:0crwdne151066:0"
 msgid "posted by"
 msgstr "crwdns151068:0crwdne151068:0"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr "crwdns151070:0crwdne151070:0"
 
@@ -5693,7 +5797,7 @@ msgstr "crwdns151074:0crwdne151074:0"
 msgid "you can"
 msgstr "crwdns151076:0crwdne151076:0"
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr "crwdns151078:0{0}crwdne151078:0"
 
diff --git a/lms/locale/es.po b/lms/locale/es.po
index f78fd96d..b5e16ab7 100644
--- a/lms/locale/es.po
+++ b/lms/locale/es.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr "Añadir una nueva pregunta"
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr "Añade un cuestionario a tu lección"
 
@@ -164,6 +164,10 @@ msgstr "Añade un cuestionario a tu lección"
 msgid "Add an assessment"
 msgstr "Añadir un examen"
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr "Añadir una pregunta existente"
@@ -176,7 +180,7 @@ msgstr "Añadir al menos una respuesta posible para esta pregunta: {0}"
 msgid "Add web page to sidebar"
 msgstr "Agregar página web a la barra lateral"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Añadir su tarea como {0}"
 
@@ -393,6 +397,8 @@ msgstr "Asignar"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "Plantilla de entrega de tareas"
 msgid "Assignment Title"
 msgstr "Título de la tarea"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Ya existe una asignación para la lección {0} por {1}."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "La tarea aparecerá al final de la lección."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Asignaciones"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Al menos una opción debe ser correcta para esta pregunta."
@@ -746,6 +760,10 @@ msgstr "Participantes certificados"
 msgid "Change"
 msgstr "Cambio"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr "Capítulos"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Marcar"
 
@@ -797,7 +815,7 @@ msgstr "Comprobar cursos"
 msgid "Choices"
 msgstr "Opciones"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Elegir todas las respuestas que apliquen"
 
@@ -805,7 +823,7 @@ msgstr "Elegir todas las respuestas que apliquen"
 msgid "Choose an icon"
 msgstr "Elegir icono"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Elige una respuesta"
 
@@ -814,12 +832,16 @@ msgstr "Elige una respuesta"
 msgid "City"
 msgstr "Ciudad"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Quitar"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr "Rol claramente definido"
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr "Haga clic en el icono añadir en el editor y del menú seleccione Encuesta. Se abrirá un diálogo donde puede seleccionar un cuestionario de la lista o crear un nuevo cuestionario. Cuando selecciona la opción Crear Nuevo, le llevará a la página de creación de cuestionarios."
 
@@ -917,6 +939,7 @@ msgstr "Color"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Color"
 msgid "Comments"
 msgstr "Comentarios"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "Completar registro"
 msgid "Completed"
 msgstr "Completado"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr "Continuar aprendiendo"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Contrato"
@@ -1045,7 +1072,7 @@ msgstr "Contrato"
 msgid "Cookie Policy"
 msgstr "Política de cookies"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr "Copia la URL del vídeo de YouTube y pégala en el editor."
 
@@ -1057,7 +1084,7 @@ msgstr "Organización corporativa"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "Lista de Cursos"
 msgid "Course Name"
 msgstr "Nombre del Curso"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr "Crear una nueva pregunta"
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Creado"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr "Escritorio"
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Detalles"
 
@@ -1619,6 +1650,10 @@ msgstr "Correo Electrónico Enviado"
 msgid "Email Templates"
 msgstr "Plantillas de correo"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr "Inscribirse ahora"
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Estudiantes inscritos"
 
@@ -1717,7 +1752,7 @@ msgstr "Confirmación de inscripción para el próximo Lote de Entrenamiento"
 msgid "Enrollment Count"
 msgstr "Recuento de inscripciones"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr "Error al inscribirse"
 
@@ -1733,7 +1768,7 @@ msgstr "Inscripciones"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "Ingrese el ID del cliente y el secreto del cliente en la configuración de Google para enviar invitaciones al calendario para evaluaciones."
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "Introduce una URL"
 
@@ -1745,6 +1780,7 @@ msgstr "Ingrese un título y guarde el cuestionario para continuar."
 msgid "Enter the correct answer"
 msgstr "Ingrese la respuesta correcta"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "Ingrese la respuesta correcta"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Error"
@@ -1919,7 +1956,7 @@ msgstr "Falla"
 msgid "Featured"
 msgstr "Destacados"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "Siéntase libre de realizar modificaciones en su envío si es necesario."
 
@@ -1938,6 +1975,10 @@ msgstr "Campo de especialización/estudio"
 msgid "File Type"
 msgstr "Tipo de Archivo"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr "Horario fijo de 9 a 5"
 msgid "Flexible Time"
 msgstr "Horario flexible"
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr "Formulario para crear y editar cuestionarios"
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "Gratis"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Freelance"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Nombre completo"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Tiempo completo"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Enlace Google Meet"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Calificación"
@@ -2083,6 +2125,10 @@ msgstr "Calificar asignación"
 msgid "Grade Type"
 msgstr "Tipo de grado"
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "Consejos"
 msgid "Host"
 msgstr "Anfitrión"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr "¿Cómo añadir un cuestionario?"
 
@@ -2168,7 +2214,7 @@ msgstr "Estoy buscando un trabajo"
 msgid "I am unavailable"
 msgstr "No estoy disponible"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "Identificador"
 
@@ -2178,7 +2224,7 @@ msgstr "Identificador"
 msgid "Icon"
 msgstr "Icono"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr "Si la opción Incluir en vista previa está habilitada para una lección, la lección también será accesible para usuarios que no hayan iniciado sesión."
 
@@ -2261,7 +2307,7 @@ msgstr "Incompleto"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "Título del trabajo"
 msgid "Jobs"
 msgstr "Trabajos"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "Unirse"
@@ -2759,7 +2805,7 @@ msgstr "Título de la lección"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr "URL LiveCode"
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "Ubicación"
 msgid "Location Preference"
 msgstr "Preferencia de ubicación"
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "Marcar como leído"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Medio:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr "Moderador"
 msgid "Modified By"
 msgstr "Modificado por"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr "El nombre del módulo es incorrecto o no existe."
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr "Módulo incorrecto."
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "Mi calendario"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nuevo"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr "Nuevo envío de la tarea"
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr "Nueva pregunta"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr "Nuevo cuestionario"
@@ -3236,7 +3290,7 @@ msgstr "Nueva respuesta sobre el tema {0} en curso {1}"
 msgid "New {0}"
 msgstr "Nuevo/a: {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Siguiente"
 
@@ -3244,7 +3298,7 @@ msgstr "Siguiente"
 msgid "Next Question"
 msgstr "Siguiente pregunta"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr "Sin evaluaciones"
 
@@ -3265,6 +3319,10 @@ msgstr "No hay próximas evaluaciones"
 msgid "No announcements"
 msgstr "Sin anuncios"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr "No se encontraron grupos"
@@ -3293,11 +3351,11 @@ msgstr "No hay cursos en revisión"
 msgid "No introduction"
 msgstr "No hay introducción"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "No hay trabajos publicados"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "No hay clases en vivo programadas"
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr "No hay cupos disponibles para esta fecha."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "No hay próximas evaluaciones."
@@ -3361,6 +3423,7 @@ msgstr "Sin calificar"
 msgid "Not Permitted"
 msgstr "No permitido"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "Desconectado"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "Una vez más, felicidades por este importante logro."
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "Una vez que el moderador califique su envío, encontrará los detalles aquí."
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sólo se aceptarán archivos del tipo {0}."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr "Sólo se permiten archivos de imagen."
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr "Número NIF"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Tiempo parcial"
@@ -3681,7 +3744,7 @@ msgstr "Porcentaje (por ejemplo, 70%)"
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr "Por favor, inicie sesión"
 
@@ -3701,7 +3764,7 @@ msgstr "Por favor, consultar su correo electrónico para la verificación"
 msgid "Please click on the following button to set your new password"
 msgstr "Haga clic en el siguiente botón para establecer su nueva contraseña"
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr "Asegúrese de completar todas las preguntas en {0} minutos."
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "Introduce una URL válida."
 
@@ -3730,7 +3793,7 @@ msgstr "Introduce una URL válida."
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "Por favor, introduzca la URL para el envío de la tarea."
 
@@ -3750,6 +3813,10 @@ msgstr "Instale la aplicación Pagos para crear un curso pago."
 msgid "Please let us know where you heard about us from."
 msgstr "Por favor, háganos saber dónde se enteró de nosotros."
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "Inicie sesión para acceder al cuestionario."
@@ -3758,7 +3825,7 @@ msgstr "Inicie sesión para acceder al cuestionario."
 msgid "Please login to access this page."
 msgstr "Por favor inicie sesión para acceder a esta página."
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "Por favor inicie sesión para continuar con el pago."
 
@@ -3795,7 +3862,7 @@ msgstr "Tome las medidas adecuadas en {0}"
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "Por favor, suba el archivo de la tarea."
 
@@ -4003,9 +4070,9 @@ msgstr "Publicado el"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr "Pregunta actualizada correctamente"
 msgid "Question {0}"
 msgstr "Pregunta {0}"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "Pregunta {0} de {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "Pregunta {0} de {1}"
 msgid "Questions"
 msgstr "Preguntas"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr "Preguntas eliminadas correctamente"
 
@@ -4079,7 +4146,7 @@ msgstr "Envíos de cuestionarios"
 msgid "Quiz Submissions"
 msgstr "Envíos de cuestionarios"
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr "Resumen del cuestionario"
 
@@ -4088,7 +4155,7 @@ msgstr "Resumen del cuestionario"
 msgid "Quiz Title"
 msgstr "Título del cuestionario"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr "Cuestionario creado correctamente"
 
@@ -4096,7 +4163,7 @@ msgstr "Cuestionario creado correctamente"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "El cuestionario no está disponible para usuarios invitados. Por favor inicie sesión para continuar."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr "Cuestionario actualizado correctamente"
 
@@ -4105,7 +4172,7 @@ msgstr "Cuestionario actualizado correctamente"
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "El cuestionario aparecerá al final de la lección."
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr "Cuestionarios"
@@ -4113,7 +4180,7 @@ msgstr "Cuestionarios"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Clasificación"
 msgid "Rating cannot be 0"
 msgstr "La calificación no puede ser 0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "Lea la pregunta detenidamente antes de intentar la asignación."
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Sábado"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Guardar"
@@ -4359,6 +4422,10 @@ msgstr "Puntuación fuera de"
 msgid "Search"
 msgstr "Buscar"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr "Buscar un icono"
@@ -4384,7 +4451,7 @@ msgstr "Asiento restantea"
 msgid "Select a question"
 msgstr "Seleccione una pregunta"
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr "Seleccione un cuestionario"
 
@@ -4392,6 +4459,10 @@ msgstr "Seleccione un cuestionario"
 msgid "Select a slot"
 msgstr "Selecciona un Espacio"
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr "Personal"
 msgid "Stage"
 msgstr "Etapa"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "Iniciar"
@@ -4664,6 +4735,7 @@ msgstr "Estadísticas"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "El estudiante {0} ya ha sido añadido a este lote."
 msgid "Students"
 msgstr "Estudiantes"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr "Estudiantes eliminados correctamente"
 
@@ -4746,19 +4818,24 @@ msgstr "Subgrupo"
 msgid "Subject"
 msgstr "Asunto"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr "Envío"
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr "Lista de entregas"
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr "Envíe su currículum para proceder con su solicitud para este puesto. U
 msgid "Submitted {0}"
 msgstr "Enviado {0}"
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr "Enviado {0}"
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "Éxito"
 
@@ -4809,7 +4889,7 @@ msgstr "Resumen"
 msgid "Sunday"
 msgstr "Domingo"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Texto"
 msgid "Thanks and Regards"
 msgstr "Gracias y saludos"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "El curso {0} ya está disponible en {1}."
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr "No hay asientos disponibles en este lote."
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "No hay estudiantes en este lote."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "No hay {0} en este sitio."
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr "Esta insignia se otorgó a {0} el {1}."
 msgid "This certificate does no expire"
 msgstr "Este certificado no caduca"
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr "Este curso tiene:"
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "Este curso es gratuito."
 
@@ -5098,10 +5194,12 @@ msgstr "Horarios:"
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "A"
 msgid "To Date"
 msgstr "Hasta la fecha"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr "Para unirse a este lote, comuníquese con el Administrador."
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr "Para cargar una imagen, un vídeo, un audio o un PDF desde su sistema, haga clic en el icono de añadir y en el menú seleccione cargar. A continuación, elija el archivo que desea añadir a la lección y se añadirá a la misma."
 
@@ -5169,7 +5267,7 @@ msgstr "Registros totales"
 msgid "Travel"
 msgstr "Viajes"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Inténtelo de nuevo"
 
@@ -5191,6 +5289,8 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Tipo"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr "Escribe tu respuesta"
 
@@ -5282,11 +5382,11 @@ msgstr "Actualizar contraseña"
 msgid "Upload"
 msgstr "Subir"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "Subir archivo"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "Subiendo {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "Miércoles"
 msgid "Welcome to {0}!"
 msgstr "Bienvenido a {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "¿Qué significa incluir en la vista previa?"
 
@@ -5453,7 +5553,7 @@ msgstr "Escribe una reseña"
 msgid "Write a review"
 msgstr "Escribir una reseña"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "Escriba su respuesta aquí"
 
@@ -5461,11 +5561,11 @@ msgstr "Escriba su respuesta aquí"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "Ya tiene una evaluación en {0} en {1} para el curso {2}."
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr "Ya estás inscrito en este lote."
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "Ya estás inscrito en este curso."
 
@@ -5530,7 +5630,7 @@ msgstr "No tienes ninguna notificación."
 msgid "You got"
 msgstr "Has conseguido"
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "Obtuviste {0}% de respuestas correctas con una puntuación de {1} de {2}"
@@ -5551,7 +5651,7 @@ msgstr "Ya has revisado este curso"
 msgid "You have been enrolled in this batch"
 msgstr "Te has inscrito en este grupo"
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr "Te has inscrito en este curso"
 
@@ -5559,6 +5659,10 @@ msgstr "Te has inscrito en este curso"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr "Has optado por recibir notificaciones sobre este curso. Recibirás un co
 msgid "You haven't enrolled for any courses"
 msgstr "No te has inscrito en ningún curso"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr "Debes iniciar sesión primero para inscribirte en este curso."
 
@@ -5584,7 +5688,7 @@ msgstr "Tendrás que obtener {0}% de respuestas correctas para poder aprobar el
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "Has solicitado ser mentor para este curso. Tu solicitud está siendo revisada."
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "Ha enviado correctamente la tarea."
 
@@ -5628,7 +5732,7 @@ msgstr "Su solicitud para unirse a nosotros como mentor del curso"
 msgid "Your score is"
 msgstr "Tu puntuación es"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr "Tu envío se ha guardado correctamente. El instructor lo revisará y calificará en breve y te notificará el resultado final."
 
@@ -5677,7 +5781,7 @@ msgstr "fuera de"
 msgid "posted by"
 msgstr "publicado por"
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr "pregunta_detalle"
 
@@ -5693,7 +5797,7 @@ msgstr "estrellas"
 msgid "you can"
 msgstr "puedes"
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr "Configuraciones {0} no encontradas"
 
diff --git a/lms/locale/fa.po b/lms/locale/fa.po
index 1f064741..696a857e 100644
--- a/lms/locale/fa.po
+++ b/lms/locale/fa.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2025-01-01 03:30\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr "حداقل یک پاسخ ممکن برای این سؤال اضافه ک
 msgid "Add web page to sidebar"
 msgstr "صفحه وب را به نوار کناری اضافه کنید"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "تکلیف خود را به عنوان {0} اضافه کنید"
 
@@ -393,6 +397,8 @@ msgstr "اختصاص دهید"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr "عنوان تکلیف"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "تکلیف برای درس {0} توسط {1} از قبل وجود دارد."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "تکلیف زیر درس نشان داده می شود."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "تکالیف"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "حداقل یک گزینه برای این سؤال باید صحیح باشد."
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr "تغییر دادن"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr "فصل با موفقیت به روز شد"
 msgid "Chapters"
 msgstr "فصل‌ها"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "بررسی"
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr "گزینه‌ها"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "همه‌ی پاسخ‌هایی که صحیح هستند را انتخاب کردن کنید"
 
@@ -805,7 +823,7 @@ msgstr "همه‌ی پاسخ‌هایی که صحیح هستند را انتخا
 msgid "Choose an icon"
 msgstr "یک تصویر انتخاب کن"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "یک پاسخ را انتخاب کردن کنید"
 
@@ -814,12 +832,16 @@ msgstr "یک پاسخ را انتخاب کردن کنید"
 msgid "City"
 msgstr "شهر"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "پاک کردن"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "رنگ"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "رنگ"
 msgid "Comments"
 msgstr "نظرات"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr "تکمیل شد"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "قرارداد"
@@ -1045,7 +1072,7 @@ msgstr "قرارداد"
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr "اسم دوره"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr "طرح کلی دوره"
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "ایجاد شده"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "جزئیات"
 
@@ -1619,6 +1650,10 @@ msgstr "ایمیل ارسال شد"
 msgid "Email Templates"
 msgstr "قالب‌های ایمیل"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "دانش آموزان ثبت نام شده"
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "پاسخ صحیح را وارد کنید"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "پاسخ صحیح را وارد کنید"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "خطا"
@@ -1919,7 +1956,7 @@ msgstr ""
 msgid "Featured"
 msgstr "ویژه"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "نوع فایل"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "رایگان"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "نام و نام خانوادگی"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "تمام وقت"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "پیوند Google Meet"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "مقطع تحصیلی"
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "راهنمایی‌ها"
 msgid "Host"
 msgstr "میزبان"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "من در دسترس نیستم"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "شناسه"
 
@@ -2178,7 +2224,7 @@ msgstr "شناسه"
 msgid "Icon"
 msgstr "آیکون"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr "ناتمام"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "عنوان شغلی"
 msgid "Jobs"
 msgstr "شغل ها"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "پیوستن"
@@ -2759,7 +2805,7 @@ msgstr "عنوان درس"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "محل"
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "علامت‌گذاری به عنوان خوانده شد"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "متوسط:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "تغییر داده شده توسط"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "تقویم من"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "جدید"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "{0} جدید"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "بعد"
 
@@ -3244,7 +3298,7 @@ msgstr "بعد"
 msgid "Next Question"
 msgstr "سؤال بعدی"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr "غیر مجاز"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "آفلاین"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "فقط فایل هایی از نوع {0} پذیرفته می شوند."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "پاره وقت"
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr "شماره تلفن"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "لطفا ایمیل خود را برای تایید بررسی کنید"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "لطفا فایل تکلیف را آپلود کنید."
 
@@ -4003,9 +4070,9 @@ msgstr "منتشر شده در"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr "سوال {0}"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "سوال {0} از {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "سوال {0} از {1}"
 msgid "Questions"
 msgstr "سوالات"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "آزمون برای کاربران مهمان در دسترس نیست. لطفا برای ادامه وارد شوید."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "تکلیف زیر درس نشان داده می شود."
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "رتبه بندی"
 msgid "Rating cannot be 0"
 msgstr "امتیاز نمی تواند ۰ باشد"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "شنبه"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "ذخیره"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "جستجو کردن"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr "صحنه"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "شروع"
@@ -4664,6 +4735,7 @@ msgstr "آمار"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "دانش‌آموز {0} قبلاً به این دسته اضافه شد
 msgid "Students"
 msgstr "دانش‌آموزان"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr "زیر گروه"
 msgid "Subject"
 msgstr "موضوع"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "موفقیت"
 
@@ -4809,7 +4889,7 @@ msgstr "خلاصه"
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "متن"
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "دوره {0} اکنون در {1} موجود است."
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "هیچ دانش‌آموزی در این گروه وجود ندارد."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "هیچ {0} در این سایت وجود ندارد."
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr "این کلاس به پایان رسید"
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "به"
 msgid "To Date"
 msgstr "تا تاریخ"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr "سفر"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "دوباره امتحان کنید"
 
@@ -5191,6 +5289,8 @@ msgstr "توییتر"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "توییتر"
 msgid "Type"
 msgstr "نوع"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr "به‌روزرسانی گذرواژه"
 msgid "Upload"
 msgstr "آپلود"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "آپلود فایل"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "در حال آپلود {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "چهار شنبه"
 msgid "Welcome to {0}!"
 msgstr "به {0} خوش آمدید!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr "از"
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr "ستاره ها"
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/fr.po b/lms/locale/fr.po
index 7ece6524..3fe6e50d 100644
--- a/lms/locale/fr.po
+++ b/lms/locale/fr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr "Ajoutez au moins une réponse possible à cette question : {0}"
 msgid "Add web page to sidebar"
 msgstr "Ajouter une page Web à la barre latérale"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Ajoutez votre devoir comme {0}"
 
@@ -393,6 +397,8 @@ msgstr "Assigner"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "Modèle de soumission d'un travail"
 msgid "Assignment Title"
 msgstr "Titre du devoir"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Le devoir pour la leçon {0} de {1} existe déjà."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Le devoir apparaîtra au bas de la leçon."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Affectations"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Au moins une option doit être correcte pour cette question."
@@ -746,6 +760,10 @@ msgstr "Participants certifiés"
 msgid "Change"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr "Chapitres"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Vérifier"
 
@@ -797,7 +815,7 @@ msgstr "Cours de vérification"
 msgid "Choices"
 msgstr "Choix"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Choisissez toutes les réponses qui s'appliquent"
 
@@ -805,7 +823,7 @@ msgstr "Choisissez toutes les réponses qui s'appliquent"
 msgid "Choose an icon"
 msgstr "Choisir une icône"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Choisissez une réponse"
 
@@ -814,12 +832,16 @@ msgstr "Choisissez une réponse"
 msgid "City"
 msgstr "Ville"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Nettoyer"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Couleur"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Couleur"
 msgid "Comments"
 msgstr "Commentaires"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "Terminer l'inscription"
 msgid "Completed"
 msgstr "Terminé"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Contrat"
@@ -1045,7 +1072,7 @@ msgstr "Contrat"
 msgid "Cookie Policy"
 msgstr "Politique des cookies"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "Liste de cours"
 msgid "Course Name"
 msgstr "Nom du cours"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Créé"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Détails"
 
@@ -1619,6 +1650,10 @@ msgstr "Email Envoyé"
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Erreur"
@@ -1919,7 +1956,7 @@ msgstr ""
 msgid "Featured"
 msgstr "En vedette"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "Type de fichier"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Nom Complet"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Note"
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr ""
 
@@ -2178,7 +2224,7 @@ msgstr ""
 msgid "Icon"
 msgstr "Icône"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "Titre de l'Emploi"
 msgid "Jobs"
 msgstr "Emplois"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "Joindre"
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "Lieu"
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Moyen:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "Modifié Par"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Nouveau"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Nouveau(elle) {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Suivant"
 
@@ -3244,7 +3298,7 @@ msgstr "Suivant"
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr "Non Autorisé"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "Veuillez vérifier votre email pour validation"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr "Publié le"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Évaluation"
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Samedi"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Sauvegarder"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "Rechercher"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr "Etape"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "Démarrer"
@@ -4664,6 +4735,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr "Sujet"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "Succès"
 
@@ -4809,7 +4889,7 @@ msgstr "Résumé"
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Texte"
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "À"
 msgid "To Date"
 msgstr "Jusqu'au"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr "Déplacement"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr "Charger"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "Envoi de {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "Mercredi"
 msgid "Welcome to {0}!"
 msgstr "Bienvenue sur {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr "Vous avez choisi d'être notifié pour ce cours. Vous recevrez un courri
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr "sur"
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/hu.po b/lms/locale/hu.po
index 6027de09..d6cb60a6 100644
--- a/lms/locale/hu.po
+++ b/lms/locale/hu.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Hungarian\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -393,6 +397,8 @@ msgstr ""
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Feladatok"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr ""
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -805,7 +823,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -814,12 +832,16 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Egyértelmű"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Szín"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Szín"
 msgid "Comments"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1045,7 +1072,7 @@ msgstr ""
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Alkotó"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Részletek"
 
@@ -1619,6 +1650,10 @@ msgstr ""
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr ""
@@ -1919,7 +1956,7 @@ msgstr "Nem sikerül"
 msgid "Featured"
 msgstr "Kiemelt"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "Fájl típusa"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Szabadúszó"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Teljes név"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Teljes munkaidőben"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr ""
 
@@ -2178,7 +2224,7 @@ msgstr ""
 msgid "Icon"
 msgstr "Ikon"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "Beosztás"
 msgid "Jobs"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr ""
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr ""
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Közepes:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "Módosította"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "Új {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr ""
 
@@ -3244,7 +3298,7 @@ msgstr ""
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Részmunkaidő"
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "Kérjük, ellenőrizze e-mail a vizsgálathoz"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr ""
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Értékelés"
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Szombat"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr ""
@@ -4664,6 +4735,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr ""
 
@@ -4809,7 +4889,7 @@ msgstr "Összefoglalás"
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5404,7 +5504,7 @@ msgstr "Szerda"
 msgid "Welcome to {0}!"
 msgstr "Üdvözöljük itt {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/main.pot b/lms/locale/main.pot
index a5fdf120..6f891748 100644
--- a/lms/locale/main.pot
+++ b/lms/locale/main.pot
@@ -1,14 +1,14 @@
 # Translations template for Frappe LMS.
-# Copyright (C) 2024 Frappe
+# Copyright (C) 2025 Frappe
 # This file is distributed under the same license as the Frappe LMS project.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2024.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Frappe LMS VERSION\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-27 16:04+0000\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-03 16:04+0000\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: jannat@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -162,6 +162,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -174,7 +178,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -391,6 +395,8 @@ msgstr ""
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -415,15 +421,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr ""
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -744,6 +758,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -772,7 +790,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr ""
 
@@ -795,7 +813,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -803,7 +821,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -812,12 +830,16 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr ""
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -915,6 +937,7 @@ msgstr ""
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -922,6 +945,10 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -984,7 +1011,7 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1034,7 +1061,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1043,7 +1070,7 @@ msgstr ""
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1055,7 +1082,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1195,7 +1222,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1320,6 +1347,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr ""
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1485,8 +1516,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr ""
 
@@ -1617,6 +1648,10 @@ msgstr ""
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1697,8 +1732,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1715,7 +1750,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1731,7 +1766,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1743,6 +1778,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1753,8 +1789,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr ""
@@ -1917,7 +1954,7 @@ msgstr ""
 msgid "Featured"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1936,6 +1973,10 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1951,7 +1992,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1965,7 +2006,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2007,7 +2048,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2067,6 +2108,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2081,6 +2123,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2144,7 +2190,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2166,7 +2212,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr ""
 
@@ -2176,7 +2222,7 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2259,7 +2305,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2467,7 +2513,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr ""
@@ -2757,7 +2803,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2823,6 +2869,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2852,6 +2899,7 @@ msgstr ""
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2911,7 +2959,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2968,6 +3016,7 @@ msgstr ""
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3138,11 +3187,11 @@ msgstr ""
 msgid "Modified By"
 msgstr ""
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3171,12 +3220,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3212,7 +3266,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3234,7 +3288,7 @@ msgstr ""
 msgid "New {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr ""
 
@@ -3242,7 +3296,7 @@ msgstr ""
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3263,6 +3317,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3291,11 +3349,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3311,6 +3369,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3359,6 +3421,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3402,7 +3465,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3419,7 +3482,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3548,7 +3611,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3679,7 +3742,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3699,7 +3762,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3719,8 +3782,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3728,7 +3791,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3748,6 +3811,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3756,7 +3823,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3793,7 +3860,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4001,9 +4068,9 @@ msgstr ""
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4040,7 +4107,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4049,7 +4116,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4077,7 +4144,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4086,7 +4153,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4094,7 +4161,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4103,7 +4170,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4111,7 +4178,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4125,10 +4192,6 @@ msgstr ""
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4307,15 +4370,15 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
@@ -4357,6 +4420,10 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4382,7 +4449,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4390,6 +4457,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4581,7 +4652,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr ""
@@ -4662,6 +4733,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4722,7 +4794,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4744,19 +4816,24 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4772,10 +4849,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4785,11 +4864,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr ""
 
@@ -4807,7 +4887,7 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4922,6 +5002,10 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4962,14 +5046,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4989,11 +5081,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5096,10 +5192,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5135,11 +5233,11 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5167,7 +5265,7 @@ msgstr ""
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5189,6 +5287,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5199,7 +5299,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5280,11 +5380,11 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5402,7 +5502,7 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5451,7 +5551,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5459,11 +5559,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5528,7 +5628,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5549,7 +5649,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5557,6 +5657,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5569,7 +5673,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5582,7 +5686,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5626,7 +5730,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5675,7 +5779,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5691,7 +5795,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/pl.po b/lms/locale/pl.po
index 340889e0..4e4a3fea 100644
--- a/lms/locale/pl.po
+++ b/lms/locale/pl.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -393,6 +397,8 @@ msgstr ""
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr ""
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr ""
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -805,7 +823,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -814,12 +832,16 @@ msgstr ""
 msgid "City"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr ""
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr ""
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr ""
 msgid "Comments"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1045,7 +1072,7 @@ msgstr ""
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr ""
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr ""
 
@@ -1619,6 +1650,10 @@ msgstr ""
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr ""
@@ -1919,7 +1956,7 @@ msgstr ""
 msgid "Featured"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr ""
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr ""
 
@@ -2178,7 +2224,7 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr ""
 msgid "Jobs"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr ""
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr ""
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Średni:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr ""
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr ""
 
@@ -3244,7 +3298,7 @@ msgstr ""
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr ""
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr ""
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr ""
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr ""
@@ -4664,6 +4735,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr ""
 
@@ -4809,7 +4889,7 @@ msgstr "Podsumowanie"
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5404,7 +5504,7 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr "Zapraszamy do {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr "spośród"
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/ru.po b/lms/locale/ru.po
index 373dc06e..ade497df 100644
--- a/lms/locale/ru.po
+++ b/lms/locale/ru.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Russian\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr "Добавьте хотя бы один возможный ответ н
 msgid "Add web page to sidebar"
 msgstr "Добавить веб страницу на боковую панель"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Добавьте свое задание как {0}"
 
@@ -393,6 +397,8 @@ msgstr "Назначать"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "Шаблон Отправленного Задания"
 msgid "Assignment Title"
 msgstr "Название задания"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Задание для урока {0} от {1} уже существует."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Задание появится в конце урока."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr ""
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Для этого вопроса должен быть верным хотя бы один вариант."
@@ -746,6 +760,10 @@ msgstr "Сертифицированные участники"
 msgid "Change"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr "Главы"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Проверка"
 
@@ -797,7 +815,7 @@ msgstr "Оформить заказ на Курсы"
 msgid "Choices"
 msgstr "Варианты ответов"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Выберите все подходящие ответы"
 
@@ -805,7 +823,7 @@ msgstr "Выберите все подходящие ответы"
 msgid "Choose an icon"
 msgstr "Выберите иконку"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Выберите один ответ"
 
@@ -814,12 +832,16 @@ msgstr "Выберите один ответ"
 msgid "City"
 msgstr ""
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr ""
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Цвет"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Цвет"
 msgid "Comments"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "Завершить регистрацию"
 msgid "Completed"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr ""
@@ -1045,7 +1072,7 @@ msgstr ""
 msgid "Cookie Policy"
 msgstr "Политика cookies"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "Список курсов"
 msgid "Course Name"
 msgstr "Название курса"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr ""
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Детали"
 
@@ -1619,6 +1650,10 @@ msgstr "Email отправлен"
 msgid "Email Templates"
 msgstr "Шаблоны Email"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Зачисленные студенты"
 
@@ -1717,7 +1752,7 @@ msgstr "Подтверждение регистрации на следующу
 msgid "Enrollment Count"
 msgstr "Количество регистраций"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr "Зачисления"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "Введите идентификатор клиента и секретный код клиента в настройках Google, чтобы отправлять приглашения в календарь для оценки."
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "Введите ссылку"
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Введите правильный ответ"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "Введите правильный ответ"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr ""
@@ -1919,7 +1956,7 @@ msgstr "Ошибка"
 msgid "Featured"
 msgstr "Популярные"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "При необходимости вы можете вносить изменения в свою заявку."
 
@@ -1938,6 +1975,10 @@ msgstr "Область специальности/исследования"
 msgid "File Type"
 msgstr "Тип файла"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Фриланс"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Полное имя"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Полная занятость"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Ссылка на Google Meet"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Уровень"
@@ -2083,6 +2125,10 @@ msgstr "Оценить Задание"
 msgid "Grade Type"
 msgstr "Шкала оценок"
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "Подсказки"
 msgid "Host"
 msgstr "Сервер"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr "Я недоступен"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr ""
 
@@ -2178,7 +2224,7 @@ msgstr ""
 msgid "Icon"
 msgstr "Иконка"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr "Не выполнено"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "Должность"
 msgid "Jobs"
 msgstr "Вакансии"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr ""
@@ -2759,7 +2805,7 @@ msgstr "Название урока"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr ""
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "Отметить как прочитанное"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Средний:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr "Модератор"
 msgid "Modified By"
 msgstr "Изменено"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr "Имя модуля неверно или не существует."
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr "Модуль неверный."
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "Мой календарь"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr "Подача нового задания"
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr "Новый ответ по теме {0} в курсе {1}"
 msgid "New {0}"
 msgstr "Новый {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr ""
 
@@ -3244,7 +3298,7 @@ msgstr ""
 msgid "Next Question"
 msgstr "Следующий вопрос"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr "Нет оценок"
 
@@ -3265,6 +3319,10 @@ msgstr "Нет предстоящих оценок"
 msgid "No announcements"
 msgstr "Нет объявлений"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr "Нет рассматриваемых курсов"
 msgid "No introduction"
 msgstr "Без введения"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "Вакансии не опубликованы"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Не запланированы онлайн-курсы"
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr "На эту дату свободных мест нет."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "Нет предстоящих оценок."
@@ -3361,6 +3423,7 @@ msgstr "Нет оценки"
 msgid "Not Permitted"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "Offline"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "Еще раз поздравляю с этим значительным достижением."
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "Как только модератор оценит вашу заявку, вы найдете подробную информацию здесь."
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Принимаются только файлы типа {0} ."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Неполная занятость"
@@ -3681,7 +3744,7 @@ msgstr "Процент (например, 70%)"
 msgid "Phone Number"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "Пожалуйста, проверьте свой email для подт
 msgid "Please click on the following button to set your new password"
 msgstr "Нажмите на следующую кнопку, чтобы установить новый пароль."
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "Введите действительный URL-адрес."
 
@@ -3730,7 +3793,7 @@ msgstr "Введите действительный URL-адрес."
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "Введите URL для отправки задания."
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "Пожалуйста, войдите в систему, чтобы получить доступ к тесту."
@@ -3758,7 +3825,7 @@ msgstr "Пожалуйста, войдите в систему, чтобы по
 msgid "Please login to access this page."
 msgstr "Пожалуйста, войдите в систему, чтобы получить доступ к этой странице."
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "Пожалуйста, войдите в систему, чтобы продолжить оплату."
 
@@ -3795,7 +3862,7 @@ msgstr "Пожалуйста, примите соответствующие ме
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "Пожалуйста, загрузите файл задания."
 
@@ -4003,9 +4070,9 @@ msgstr "Опубликована"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr "Вопрос {0}:"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "Вопрос {0} из {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "Вопрос {0} из {1}"
 msgid "Questions"
 msgstr "Вопросы"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr "Подача теста"
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr "Краткое содержание теста"
 
@@ -4088,7 +4155,7 @@ msgstr "Краткое содержание теста"
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Тест недоступен для гостевых пользователей. Пожалуйста, войдите, чтобы продолжить."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Тест появится в конце урока."
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Рейтинг"
 msgid "Rating cannot be 0"
 msgstr "Рейтинг не может быть 0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "Прежде чем приступить к выполнению задания, внимательно прочитайте вопрос."
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Суббота"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr ""
@@ -4359,6 +4422,10 @@ msgstr "Оценка из"
 msgid "Search"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr "Поиск значка"
@@ -4384,7 +4451,7 @@ msgstr "Осталось мест"
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr "Персонал"
 msgid "Stage"
 msgstr "Состояние"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr ""
@@ -4664,6 +4735,7 @@ msgstr "Статистика"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "Курс {0} уже добавлен в группу."
 msgid "Students"
 msgstr "Студенты"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr "Подруппа"
 msgid "Subject"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr "Сданные"
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr "Отправьте свое резюме, чтобы продолжит
 msgid "Submitted {0}"
 msgstr "Отправлено {0}"
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr "Отправлено {0}"
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr ""
 
@@ -4809,7 +4889,7 @@ msgstr "Резюме"
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Текст"
 msgid "Thanks and Regards"
 msgstr "Спасибо и с наилучшими пожеланиями"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "Курс {0} теперь доступен на {1}."
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr "В этой группе нет свободных мест."
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "В этой группе нет студентов."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "На этом сайте нет {0} ."
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr "Этот бейдж был вручен {0} {1}."
 msgid "This certificate does no expire"
 msgstr "Этот сертификат является бессрочным"
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "Этот курс бесплатный."
 
@@ -5098,10 +5194,12 @@ msgstr "Сроки:"
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr ""
 msgid "To Date"
 msgstr ""
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr "Чтобы присоединиться к этой группе, свяжитесь с администратором."
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr "Всего регистраций"
 msgid "Travel"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Попробовать снова"
 
@@ -5191,6 +5289,8 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "Загрузить файл"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "Загрузка {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "Среда"
 msgid "Welcome to {0}!"
 msgstr "Добро пожаловать в {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr "Написать отзыв"
 msgid "Write a review"
 msgstr "Написать отзыв"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "Напишите свой ответ здесь"
 
@@ -5461,11 +5561,11 @@ msgstr "Напишите свой ответ здесь"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "У вас уже есть оценка {0} в {1} для курса {2}."
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr "Вы уже зачислены в эту группу."
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "Вы уже зачислены на этот курс."
 
@@ -5530,7 +5630,7 @@ msgstr "У вас нет уведомлений."
 msgid "You got"
 msgstr "Вы получили"
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "Вы получили {0}% правильных ответов с оценкой {1} из {2}"
@@ -5551,7 +5651,7 @@ msgstr "Вы уже просмотрели этот курс"
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr "Вы выбрали получение уведомлений об эт
 msgid "You haven't enrolled for any courses"
 msgstr "Вы не записались ни на один курс"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr "Чтобы пройти тест, вам нужно будет дать
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "Вы подали заявку на должность наставника этого курса. Ваш запрос в настоящее время находится на рассмотрении."
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "Вы успешно отправили задание."
 
@@ -5628,7 +5732,7 @@ msgstr "Ваш запрос на присоединение к нам в кач
 msgid "Your score is"
 msgstr "Ваш результат:"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr "из"
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr "звезды"
 msgid "you can"
 msgstr "вы можете"
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/locale/sv.po b/lms/locale/sv.po
index bb4d0399..2d9cc389 100644
--- a/lms/locale/sv.po
+++ b/lms/locale/sv.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Swedish\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr "Lägg till Lektion"
 msgid "Add a new question"
 msgstr "Lägg till ny fråga"
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr "Lägg till frågesport till din lektion"
 
@@ -164,6 +164,10 @@ msgstr "Lägg till frågesport till din lektion"
 msgid "Add an assessment"
 msgstr "Lägg till bedömning"
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr "Lägg till uppgift till din lektion"
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr "Lägg till befintlig fråga"
@@ -176,7 +180,7 @@ msgstr "Lägg till minst ett möjligt svar för denna fråga: {0}"
 msgid "Add web page to sidebar"
 msgstr "Lägg till webbsida i sidofältet"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Lägg till din uppgift som {0}"
 
@@ -393,6 +397,8 @@ msgstr "Tilldela"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -415,17 +421,25 @@ msgstr "Uppgift Inlämning Mall"
 #. Submission'
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 msgid "Assignment Title"
-msgstr "Bedömning Titel"
+msgstr "Uppgift Benämning"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "Uppgift för Lektion {0} av {1} finns redan."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr "Uppgift sparad"
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Uppgift kommer att visas längst ner i lektion."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Uppgifter"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Minst ett alternativ måste vara korrekt för denna fråga."
@@ -563,7 +577,7 @@ msgstr "Grupp Studerande"
 #. Label of the batch_title (Data) field in DocType 'LMS Certificate Request'
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 msgid "Batch Title"
-msgstr "Grupp Titel"
+msgstr "Grupp Benämning"
 
 #: lms/public/js/common_functions.js:427
 msgid "Batch Updated"
@@ -746,6 +760,10 @@ msgstr "Certifierade Deltagare"
 msgid "Change"
 msgstr "Ändra"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr "Ändringar sparade"
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr "Kapitel uppdaterad"
 msgid "Chapters"
 msgstr "Kapitel"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Check"
 
@@ -797,7 +815,7 @@ msgstr "Kolla Kurser"
 msgid "Choices"
 msgstr "Alternativ"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Välj alla svar som gäller"
 
@@ -805,7 +823,7 @@ msgstr "Välj alla svar som gäller"
 msgid "Choose an icon"
 msgstr "Välj Ikon"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Välj ett svar"
 
@@ -814,12 +832,16 @@ msgstr "Välj ett svar"
 msgid "City"
 msgstr "Ort"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Rensa"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr "Tydligt Definierad Roll"
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr "Klicka på lägg till ikon i redigeraren och välj Frågesport från menyn. Det öppnar dialogruta där du antingen kan välja frågesport från listan eller skapa nytt frågesport. När du väljer alternativ Skapa nytt omdirigeras du till en annan sida för att skapa frågesport."
 
@@ -917,6 +939,7 @@ msgstr "Färg"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Färg"
 msgid "Comments"
 msgstr "Kommentarer"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr "Kommentarer av Utvärderare"
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "Slutför Registrering"
 msgid "Completed"
 msgstr "Klar"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr "Klart av Studenter"
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr "Fortsätt lära dig"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Avtal"
@@ -1045,7 +1072,7 @@ msgstr "Avtal"
 msgid "Cookie Policy"
 msgstr "Princip för Kakor"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr "Kopiera webbadress till video från YouTube och klistra in i redigerare."
 
@@ -1057,7 +1084,7 @@ msgstr "Organisation"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1173,7 +1200,7 @@ msgstr "Kursbeskrivning"
 #. Name of a DocType
 #: lms/lms/doctype/course_evaluator/course_evaluator.json
 msgid "Course Evaluator"
-msgstr "Kursutvärderare"
+msgstr "Kurs Utvärderare"
 
 #: frontend/src/pages/CourseForm.vue:62
 msgid "Course Image"
@@ -1197,7 +1224,7 @@ msgstr "Kurslista"
 msgid "Course Name"
 msgstr "Kursnamn"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr "Kursöversikt"
 
@@ -1233,7 +1260,7 @@ msgstr "Kursstatistik"
 #: lms/lms/doctype/lms_certificate_request/lms_certificate_request.json
 #: lms/lms/doctype/lms_program_course/lms_program_course.json
 msgid "Course Title"
-msgstr "Kurstitel"
+msgstr "Kurs Benämning"
 
 #: frontend/src/pages/ProgramForm.vue:229
 msgid "Course added to program"
@@ -1322,6 +1349,10 @@ msgstr "Skapa Kurs"
 msgid "Create a new question"
 msgstr "Skapa ny fråga"
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Skapad"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr "Skrivbord"
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Detaljer"
 
@@ -1619,6 +1650,10 @@ msgstr "E-post Skickad"
 msgid "Email Templates"
 msgstr "E-Post Mallar"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr "E-post kopierad till urklipp"
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr "Registrera Nu"
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Inskrivna Studenter"
 
@@ -1717,7 +1752,7 @@ msgstr "Inskrivning bekräftelse för nästa grupp utbildning"
 msgid "Enrollment Count"
 msgstr "Antal Inskrivna"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr "Registrering Misslyckad"
 
@@ -1733,18 +1768,19 @@ msgstr "Inskrivningar"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "Ange Klient Id och Klient Hemlighet i Google inställningar för att skicka kalender inbjudningar för utvärderingar."
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "Ange URL"
 
 #: frontend/src/pages/QuizForm.vue:49
 msgid "Enter a title and save the quiz to proceed"
-msgstr "Ange titel och spara frågesport för att fortsätta"
+msgstr "Ange benämning och spara frågesport för att fortsätta"
 
 #: lms/templates/quiz/quiz.html:53
 msgid "Enter the correct answer"
 msgstr "Ange korrekt svar"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "Ange korrekt svar"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Fel"
@@ -1866,7 +1903,7 @@ msgstr "Övning inlämning"
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Exercise Title"
-msgstr "Övningens Titel"
+msgstr "Övning Benämning"
 
 #: frontend/src/components/CourseOutline.vue:14
 msgid "Expand all chapters"
@@ -1919,7 +1956,7 @@ msgstr "Misslyckad "
 msgid "Featured"
 msgstr "Utvald"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "Känn dig fri att göra ändringar i din inlämning om det behövs."
 
@@ -1938,6 +1975,10 @@ msgstr "Huvudämne/Studieinriktning"
 msgid "File Type"
 msgstr "Fil Typ"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr "Hitta det perfekta jobbet för dig"
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr "Fast 9-5"
 msgid "Flexible Time"
 msgstr "Flexibel Tid"
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr "Formulär för att skapa och redigera frågesporter"
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "Gratis"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Frilansare"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Fullständig Namn"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Heltid"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Google Meet Länk"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Betyg"
@@ -2083,6 +2125,10 @@ msgstr "Betyg Tilldelning"
 msgid "Grade Type"
 msgstr "Betyg Typ"
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr "Betygsättning"
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "Tips"
 msgid "Host"
 msgstr "Värd"
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr "Hur lägger man till Frågesport?"
 
@@ -2168,7 +2214,7 @@ msgstr "Jag söker jobb"
 msgid "I am unavailable"
 msgstr "Jag är inte tillgänglig"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "ID"
 
@@ -2178,7 +2224,7 @@ msgstr "ID"
 msgid "Icon"
 msgstr "Ikon"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr "Om Inkludera i Förhandsvisning är aktiverat för en lektion då lektionen kommer också att vara tillgänglig för ej inloggade användare."
 
@@ -2261,7 +2307,7 @@ msgstr "Ej komplett"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2431,12 +2477,12 @@ msgstr "Jobb"
 #. Label of the subtitle (Data) field in DocType 'Job Settings'
 #: lms/job/doctype/job_settings/job_settings.json
 msgid "Job Board Subtitle"
-msgstr "Jobbstyrelse Undertitel"
+msgstr "Jobb Styrelse Underbenämning"
 
 #. Label of the title (Data) field in DocType 'Job Settings'
 #: lms/job/doctype/job_settings/job_settings.json
 msgid "Job Board Title"
-msgstr "Jobbstyrelse Titel"
+msgstr "Jobb Styrelse Benämning"
 
 #: frontend/src/pages/JobCreation.vue:14
 msgid "Job Details"
@@ -2461,7 +2507,7 @@ msgstr "Jobb Inställningar"
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/job/doctype/lms_job_application/lms_job_application.json
 msgid "Job Title"
-msgstr "Jobb Titel"
+msgstr "Jobb Benämning"
 
 #. Label of the jobs (Check) field in DocType 'LMS Settings'
 #: frontend/src/pages/JobDetail.vue:10 frontend/src/pages/Jobs.vue:8
@@ -2469,7 +2515,7 @@ msgstr "Jobb Titel"
 msgid "Jobs"
 msgstr "Jobb"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "Anslut"
@@ -2753,13 +2799,13 @@ msgstr "Lektion Referens"
 #. Label of the lesson_title (Data) field in DocType 'Scheduled Flow'
 #: lms/lms/doctype/scheduled_flow/scheduled_flow.json
 msgid "Lesson Title"
-msgstr "Lektion Titel"
+msgstr "Lektion Benämning"
 
 #. Label of the lessons (Table) field in DocType 'Course Chapter'
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr "LiveCode URL"
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "Plats"
 msgid "Location Preference"
 msgstr "Platspreferens"
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "Markera som läst"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Medium:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr "Moderator"
 msgid "Modified By"
 msgstr "Modifierad Av"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr "Modul Namn är felaktigt eller existerar inte."
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr "Modul är felaktig."
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "Min kalender"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Ny"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr "Ny Uppgift"
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr "Ny Uppgift Inlämning"
 
@@ -3214,7 +3268,7 @@ msgstr "Ny Program Medlem"
 msgid "New Question"
 msgstr "Ny Fråga"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr "Nytt Frågesport"
@@ -3236,7 +3290,7 @@ msgstr "Nytt svar i ämne {0} i kurs {1}"
 msgid "New {0}"
 msgstr "Ny {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Nästa"
 
@@ -3244,7 +3298,7 @@ msgstr "Nästa"
 msgid "Next Question"
 msgstr "Nästa Fråga"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr "Inga Bedömningar"
 
@@ -3265,6 +3319,10 @@ msgstr "Inga Kommande Utvärderingar"
 msgid "No announcements"
 msgstr "Inga tillkännagivanden"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr "Inga uppgifter hittades"
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr "Inga grupper hittades"
@@ -3293,11 +3351,11 @@ msgstr "Inga kurser under granskning"
 msgid "No introduction"
 msgstr "Ingen introduktion"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "Inga jobb utannonserade"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Inga live lektioner schemalagda"
 
@@ -3313,6 +3371,10 @@ msgstr "Inga frågesporter hittades"
 msgid "No slots available for this date."
 msgstr "Inga lediga tider för detta datum."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr "Inga inlämningar"
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "Inga kommande utvärderingar."
@@ -3361,6 +3423,7 @@ msgstr "Ej Betygsatt"
 msgid "Not Permitted"
 msgstr "Ej Tillåtet"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "Frånkopplad"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "Än en gång gratulationer till detta betydelsefulla resultat."
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "När moderator betygsatt din inlämning, hittar du detaljerna här."
 
@@ -3421,7 +3484,7 @@ msgstr "Endast kurser för vilka självinlärning är inaktiverat kan läggas ti
 msgid "Only files of type {0} will be accepted."
 msgstr "Endast filer av typ {0} kommer att accepteras."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr "Endast bildfiler är tillåtna."
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr "Pan Nummer"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Deltid"
@@ -3681,7 +3744,7 @@ msgstr "Procent (t.ex. 70%)"
 msgid "Phone Number"
 msgstr "Telefon Nummer"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr "Logga in"
 
@@ -3701,7 +3764,7 @@ msgstr "Kontrollera din E-post för verifiering"
 msgid "Please click on the following button to set your new password"
 msgstr "Klicka på följande knapp för att ange ditt nya lösenord"
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr "Slutför tidigare kurser i program för att anmäla dig till denna kurs."
 
@@ -3719,10 +3782,10 @@ msgstr "Se till att besvara alla frågor på {0} minuter."
 
 #: frontend/src/components/Modals/LiveClassModal.vue:164
 msgid "Please enter a title."
-msgstr "Ange titel."
+msgstr "Ange benämning."
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "Ange giltig URL."
 
@@ -3730,7 +3793,7 @@ msgstr "Ange giltig URL."
 msgid "Please enter a valid time in the format HH:mm."
 msgstr "Ange giltig tid i format HH:mm."
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "Ange URL för uppgift inlämning."
 
@@ -3750,6 +3813,10 @@ msgstr "Installera Betalning App för att skapa betalda kurser."
 msgid "Please let us know where you heard about us from."
 msgstr "Låt oss veta varifrån du hörde talas om oss."
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr "Logga in för att komma åt uppgift."
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "Logga in för att komma åt frågesport."
@@ -3758,7 +3825,7 @@ msgstr "Logga in för att komma åt frågesport."
 msgid "Please login to access this page."
 msgstr "Logga in för att komma till denna sida."
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "Logga in för att fortsätta med betalning."
 
@@ -3795,7 +3862,7 @@ msgstr "Vidta lämpliga åtgärder {0}"
 msgid "Please upload a SCORM package"
 msgstr "Ladda upp SCORM App"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "Ladda upp tilldelning fil."
 
@@ -4003,9 +4070,9 @@ msgstr "Publicerad"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr "Fråga uppdaterad"
 msgid "Question {0}"
 msgstr "Fråga {0}"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "Fråga {0} av {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "Fråga {0} av {1}"
 msgid "Questions"
 msgstr "Frågor"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr "Frågor är borttagna"
 
@@ -4079,16 +4146,16 @@ msgstr "Frågesport Inlämning"
 msgid "Quiz Submissions"
 msgstr "Frågesport Inlämningar"
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr "Frågesport Sammanfattning"
 
 #. Label of the quiz_title (Data) field in DocType 'LMS Quiz Submission'
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.json
 msgid "Quiz Title"
-msgstr "Frågesport Titel"
+msgstr "Frågesport Benämning"
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr "Frågesport skapad"
 
@@ -4096,7 +4163,7 @@ msgstr "Frågesport skapad"
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr "Frågesport är inte tillgänglig för gästanvändare. Logga in för att fortsätta."
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr "Frågesport uppdaterad"
 
@@ -4105,7 +4172,7 @@ msgstr "Frågesport uppdaterad"
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr "Frågesport kommer att visas längst ner i lektionen."
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr "Frågesporter"
@@ -4113,7 +4180,7 @@ msgstr "Frågesporter"
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Bedömning"
 msgid "Rating cannot be 0"
 msgstr "Betyg kan inte vara 0"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "Läs igenom frågan noggrant innan du påbörjar uppgift."
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr "SCORM App Sökväg"
 msgid "Saturday"
 msgstr "Lördag"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Spara"
@@ -4359,6 +4422,10 @@ msgstr "Resultat av"
 msgid "Search"
 msgstr "Sök"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr "Sök efter benämning"
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr "Sök efter ikon"
@@ -4384,7 +4451,7 @@ msgstr "Antal Platser Kvar"
 msgid "Select a question"
 msgstr "Välj fråga"
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr "Välj Frågesport"
 
@@ -4392,6 +4459,10 @@ msgstr "Välj Frågesport"
 msgid "Select a slot"
 msgstr "Välj tid"
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr "Välj uppgift"
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4487,7 +4558,7 @@ msgstr "Registrering är inaktiverad"
 
 #: lms/templates/signup-form.html:53
 msgid "Sign up"
-msgstr "Registrera dig"
+msgstr "Registrera"
 
 #. Label of the signup_email (Data) field in DocType 'Invite Request'
 #: lms/lms/doctype/invite_request/invite_request.json
@@ -4569,7 +4640,7 @@ msgstr "Lösning"
 #: lms/lms/doctype/lms_payment/lms_payment.json
 #: lms/lms/doctype/lms_source/lms_source.json
 msgid "Source"
-msgstr "Källa"
+msgstr "Från"
 
 #. Option for the 'Role' (Select) field in DocType 'Cohort Staff'
 #. Option for the 'Member Type' (Select) field in DocType 'LMS Enrollment'
@@ -4583,7 +4654,7 @@ msgstr "Personal"
 msgid "Stage"
 msgstr "Steg"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "Start"
@@ -4664,6 +4735,7 @@ msgstr "Statistik"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "Student {0} har redan lagts till denna grupp."
 msgid "Students"
 msgstr "Studenter"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr "Studenter borttagna"
 
@@ -4746,19 +4818,24 @@ msgstr "Undergrupp"
 msgid "Subject"
 msgstr "Ämne"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr "Inlämning"
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr "Inlämning Lista"
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr "Inlämning av"
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr "Lämna in ditt CV för att gå vidare med din ansökan till denna tjäns
 msgid "Submitted {0}"
 msgstr "Inskickad {0}"
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr "Inskickad {0}"
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "Klar"
 
@@ -4809,7 +4889,7 @@ msgstr "Översikt"
 msgid "Sunday"
 msgstr "Söndag"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr "Misstänkt mönster hittat i {0}: {1}"
 
@@ -4924,6 +5004,10 @@ msgstr "Text"
 msgid "Thanks and Regards"
 msgstr "Tack och Hälsningar"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr "Gruppen är full. Kontakta administratör."
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "Kurs {0} är nu tillgänglig på {1}."
@@ -4964,14 +5048,22 @@ msgstr "Det finns inga program tillgängliga för tillfället. Håll utkik, nya
 msgid "There are no seats available in this batch."
 msgstr "Det finns inga platser tillgängliga i denna grupp."
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "Det finns inga studenter i denna grupp."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr "Det finns inga inlämningar för denna uppgift."
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "Det finns ingen {0} på denna webbplats."
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr "Det har skett uppdatering av din inlämning för uppgift {0}"
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr "Det har skett uppdatering av din inlämning. Du har fått resultat av {0} för frågesport {1}"
@@ -4991,11 +5083,15 @@ msgstr "Detta emblem är tilldelad {0} {1}."
 msgid "This certificate does no expire"
 msgstr "Detta certifikat upphör inte att gälla"
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr "Denna klass har avslutats"
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr "Denna kurs har:"
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "Denna kurs är gratis."
 
@@ -5098,10 +5194,12 @@ msgstr "Tidpunkter:"
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5120,11 +5218,11 @@ msgstr "Tidpunkter:"
 #: lms/lms/doctype/work_experience/work_experience.json
 #: lms/public/js/common_functions.js:259
 msgid "Title"
-msgstr "Titel"
+msgstr "Benämning"
 
 #: frontend/src/components/Modals/ChapterModal.vue:174
 msgid "Title is required"
-msgstr "Titel erfordras"
+msgstr "Benämning erfordras"
 
 #. Label of the unavailable_to (Date) field in DocType 'Course Evaluator'
 #: frontend/src/pages/ProfileEvaluator.vue:98
@@ -5137,11 +5235,11 @@ msgstr "Till"
 msgid "To Date"
 msgstr "Till Datum"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr "För att gå med i denna grupp, kontakta Administratör."
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr "För att ladda upp bild, video, ljud eller PDF från ditt system, klicka på ikonen Lägg till och välj ladda upp från menyn. Välj sedan filen du vill lägga till i lektionen och den läggs till din lektion."
 
@@ -5169,7 +5267,7 @@ msgstr "Totalt antal registreringar"
 msgid "Travel"
 msgstr "Resa"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Försök igen"
 
@@ -5191,6 +5289,8 @@ msgstr "Twitter"
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr "Twitter"
 msgid "Type"
 msgstr "Typ"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr "Skriv ditt svar"
 
@@ -5282,11 +5382,11 @@ msgstr "Uppdatera lösenord"
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "Ladda upp fil"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "Ladda Upp {0}%"
 
@@ -5404,7 +5504,7 @@ msgstr "Onsdag"
 msgid "Welcome to {0}!"
 msgstr "Välkommen till {0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr "Vad betyder inkludera i förhandsvisning?"
 
@@ -5453,7 +5553,7 @@ msgstr "Skriv en Recension"
 msgid "Write a review"
 msgstr "Skriv en recension"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "Skriv ditt svar här"
 
@@ -5461,11 +5561,11 @@ msgstr "Skriv ditt svar här"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr "Du har redan utvärdering {0} kl. {1} för kurs {2}."
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr "Du är redan inskriven för denna grupp."
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "Du är redan inskriven på denna kurs."
 
@@ -5530,7 +5630,7 @@ msgstr "Du har inga aviseringar."
 msgid "You got"
 msgstr "Du har"
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "Du fick {0}% rätta svar med resultat på {1} av {2}"
@@ -5551,7 +5651,7 @@ msgstr "Du har redan granskat denna kurs"
 msgid "You have been enrolled in this batch"
 msgstr "Du har blivit registrerad i denna grupp"
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr "Du har blivit registrerad på denna kurs"
 
@@ -5559,6 +5659,10 @@ msgstr "Du har blivit registrerad på denna kurs"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr "Du har fått resultat av {0} för frågesport {1}"
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr "Du har inte skapat några uppgifter ännu. För att skapa ny uppgift, klicka på knapp \"Ny\" ovan."
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr "Du har inte skapat några frågesporter än. För att skapa ny frågesport, klicka på knapp \"Nytt Frågesport\" ovan."
@@ -5571,7 +5675,7 @@ msgstr "Du har valt att bli meddelad om denna kurs. Du kommer att få ett e-post
 msgid "You haven't enrolled for any courses"
 msgstr "Du är inte inskriven till någon kurs"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr "Du måste logga in först för att registrera dig till denna kurs"
 
@@ -5584,7 +5688,7 @@ msgstr "Du måste få {0}% korrekta svar för att klara frågesport."
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "Du har ansökt om att bli mentor för denna kurs. Din begäran är för närvarande under granskning."
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "Du har lyckats lämna in uppgift."
 
@@ -5628,7 +5732,7 @@ msgstr "Din begäran om att bli mentor för kurs"
 msgid "Your score is"
 msgstr "Ditt resultat är"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr "Din inlämning är sparad. Lärare kommer att granska och betygsätta den inom kort och du kommer att få meddelande om ditt slutresultat."
 
@@ -5677,7 +5781,7 @@ msgstr "av"
 msgid "posted by"
 msgstr "postad av "
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr "fråga_detalj"
 
@@ -5693,7 +5797,7 @@ msgstr "stjärnor"
 msgid "you can"
 msgstr "du kan"
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr "{0} Inställningar hittades inte"
 
diff --git a/lms/locale/tr.po b/lms/locale/tr.po
index ef8f4534..689f55fa 100644
--- a/lms/locale/tr.po
+++ b/lms/locale/tr.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Turkish\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr "Yeni Soru Ekle"
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr "Dersinize bir sınav ekleyin"
 
@@ -164,6 +164,10 @@ msgstr "Dersinize bir sınav ekleyin"
 msgid "Add an assessment"
 msgstr "Bir değerlendirme ekleyin"
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr "Mevcut bir soruyu ekle"
@@ -176,7 +180,7 @@ msgstr "Bu soru için en azından bir olası cevap ekleyin: {0}"
 msgid "Add web page to sidebar"
 msgstr "Web sayfasını kenar çubuğuna ekle"
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr "Ödevinizi {0} olarak ekleyin"
 
@@ -393,6 +397,8 @@ msgstr "Ata"
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr "Ödev Gönderim Şablonu"
 msgid "Assignment Title"
 msgstr "Ödev Başlığı"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr "{1} tarafından verilen {0} Dersi için ödev zaten mevcut."
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr "Ödev dersin alt kısmında görünecektir."
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "Atamalar"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr "Bu soruda en az bir seçeneğin doğru olması gerekmektedir."
@@ -746,6 +760,10 @@ msgstr "Sertifikalı Katılımcılar"
 msgid "Change"
 msgstr "Değiştir"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr "Bölümler"
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "Kontrol et"
 
@@ -797,7 +815,7 @@ msgstr "Kursları Kontrol Et"
 msgid "Choices"
 msgstr "Seçimler"
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr "Uygulanabilir tüm cevapları seçin"
 
@@ -805,7 +823,7 @@ msgstr "Uygulanabilir tüm cevapları seçin"
 msgid "Choose an icon"
 msgstr "Bir simge seçimi"
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr "Bir cevap seçin"
 
@@ -814,12 +832,16 @@ msgstr "Bir cevap seçin"
 msgid "City"
 msgstr "Şehir"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "Açık"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "Renk"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "Renk"
 msgid "Comments"
 msgstr "Yorumlar"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr "Kayıt İşlemini Tamamlayın"
 msgid "Completed"
 msgstr "Tamamlandı"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr "Öğrenmeye Devam Et"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "Sözleşme"
@@ -1045,7 +1072,7 @@ msgstr "Sözleşme"
 msgid "Cookie Policy"
 msgstr "Çerez Politikası"
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr "Kurumsal Organizasyon"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr "Kurs Listesi"
 msgid "Course Name"
 msgstr "Kurs Adı"
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr "Yeni bir soru oluştur"
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr "Oluşturdu"
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "Ayrıntılar"
 
@@ -1619,6 +1650,10 @@ msgstr "E-posta Gönderildi"
 msgid "Email Templates"
 msgstr "E-Posta Şablonları"
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr "Hemen Kaydol"
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr "Kayıtlı Öğrenci"
 
@@ -1717,7 +1752,7 @@ msgstr "Sonraki Eğitim Grubu için Kayıt Onayı"
 msgid "Enrollment Count"
 msgstr "Kayıt Sayısı"
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr "Kayıt Başarısız"
 
@@ -1733,7 +1768,7 @@ msgstr "Kayıtlar"
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr "Değerlendirmeler için takvim davetleri göndermek üzere Google Ayarları'na İstemci Kimliği ve İstemci Gizli Anahtarını girin."
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr "Bir URL girin"
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr "Doğru cevabı girin"
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr "Doğru cevabı girin"
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "Hata"
@@ -1919,7 +1956,7 @@ msgstr "Başarısız"
 msgid "Featured"
 msgstr "Öne Çıkan"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr "Gerektiğinde gönderinizde düzenlemeler yapmaktan çekinmeyin."
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "Dosya Türü"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr "Sabit 8-5"
 msgid "Flexible Time"
 msgstr "Esnek Zaman"
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr "Serbest"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr "Serbest çalışan"
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "Tam Adı"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr "Tam Zamanlı"
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr "Google Meet Bağlantısı"
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr "Ünvan"
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr "İpuçları"
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr "Sınav nasıl eklenir?"
 
@@ -2168,7 +2214,7 @@ msgstr "Bir iş arıyorum"
 msgid "I am unavailable"
 msgstr "Müsait değilim"
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "ID"
 
@@ -2178,7 +2224,7 @@ msgstr "ID"
 msgid "Icon"
 msgstr "Simge"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr "Tamamlanmadı"
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr "İş İlanı Başlığı"
 msgid "Jobs"
 msgstr "İşler"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "Katıl"
@@ -2759,7 +2805,7 @@ msgstr "Ders Başlığı"
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "Konum"
 msgid "Location Preference"
 msgstr "Konum Tercihi"
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr "Okundu olarak İşaretle"
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "Orta:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr "Moderatör"
 msgid "Modified By"
 msgstr "Değiştiren"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr "Modül Adı yanlış veya mevcut değil."
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr "Modül hatalı."
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr "Takvimim"
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "Yeni"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr "Yeni Ödev Gönderimi"
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr "Yeni Soru"
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr "Yeni Test"
@@ -3236,7 +3290,7 @@ msgstr "{1} dersinde {0} konusuna yeni yanıt"
 msgid "New {0}"
 msgstr "Yeni {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "Sonraki"
 
@@ -3244,7 +3298,7 @@ msgstr "Sonraki"
 msgid "Next Question"
 msgstr "Sonraki Soru"
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr "Değerlendirme Yok"
 
@@ -3265,6 +3319,10 @@ msgstr "Yaklaşan Değerlendirme Yok"
 msgid "No announcements"
 msgstr "Hiçbir duyuru yok"
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr "Toplu kurs bulunamadı"
@@ -3293,11 +3351,11 @@ msgstr "İncelenmekte olan kurs yok"
 msgid "No introduction"
 msgstr "Tanıtım yok"
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr "Hiçbir iş ilanı yayınlanmadı"
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr "Planlanmış canlı ders yok"
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr "Bu tarih için boş yer bulunmamaktadır."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr "Yaklaşan değerlendirme yok."
@@ -3361,6 +3423,7 @@ msgstr "Not Verilmedi"
 msgid "Not Permitted"
 msgstr "İzin Verilmedi"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr "Çevrimdışı"
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr "Bu önemli başarı için bir kez daha tebrikler."
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr "Moderatör başvurunuzu değerlendirdiğinde, ayrıntıları burada bulabilirsiniz."
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr "Sadece {0} türündeki dosyalar kabul edilecektir."
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr "Sadece resim dosyasına izin verilir."
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr "Yarı Zamanlı"
@@ -3681,7 +3744,7 @@ msgstr "Yüzde (örn. %70)"
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr "Lütfen Giriş Yapın"
 
@@ -3701,7 +3764,7 @@ msgstr "Doğrulama için lütfen e-postanızı kontrol edin"
 msgid "Please click on the following button to set your new password"
 msgstr "Yeni şifrenizi belirlemek için lütfen aşağıdaki linke tıklayınız"
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr "Lütfen tüm soruları {0} dakika içinde yanıtladığınızdan emin ol
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr "Lütfen geçerli bir URL girin."
 
@@ -3730,7 +3793,7 @@ msgstr "Lütfen geçerli bir URL girin."
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr "Lütfen ödev gönderimi için URL'yi girin."
 
@@ -3750,6 +3813,10 @@ msgstr "Ücretli kurslar oluşturmak için lütfen Ödemeler uygulamasını yük
 msgid "Please let us know where you heard about us from."
 msgstr "Lütfen bizi nereden duyduğunuzu belirtin."
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr "Teste erişmek için lütfen giriş yapın."
@@ -3758,7 +3825,7 @@ msgstr "Teste erişmek için lütfen giriş yapın."
 msgid "Please login to access this page."
 msgstr "Bu sayfaya erişebilmek için lütfen giriş yapın."
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr "Ödeme işlemine devam etmek için lütfen giriş yapın."
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr "Lütfen ödev dosyasını yükleyin."
 
@@ -4003,9 +4070,9 @@ msgstr "Yayınlanma Zamanı"
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr "Soru başarıyla güncellendi"
 msgid "Question {0}"
 msgstr "Soru {0}"
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr "Soru {0} / {1}"
 
@@ -4051,7 +4118,7 @@ msgstr "Soru {0} / {1}"
 msgid "Questions"
 msgstr "Sorular"
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr "Sorular başarıyla silindi"
 
@@ -4079,7 +4146,7 @@ msgstr "Sınav Gönderimi"
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr "Sınav başarıyla güncellendi"
 
@@ -4105,7 +4172,7 @@ msgstr "Sınav başarıyla güncellendi"
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr "Değerlendirme"
 msgid "Rating cannot be 0"
 msgstr "Değerlendirme 0 olamaz"
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr "Ödevi yapmadan önce soruyu dikkatlice okuyun."
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr "Cumartesi"
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "Kaydet"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "Arama"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr "Bir simge arayın"
@@ -4384,7 +4451,7 @@ msgstr "Kalan Koltuk Sayısı"
 msgid "Select a question"
 msgstr "Bir soru seçin"
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr "Ekip"
 msgid "Stage"
 msgstr "Aşama"
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "Başlangıç"
@@ -4664,6 +4735,7 @@ msgstr "İstatistik"
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr "Öğrenci {0} zaten bu gruba eklendi."
 msgid "Students"
 msgstr "Öğrenciler"
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr "Alt Grup"
 msgid "Subject"
 msgstr "Konu"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr "Kaydedildi {0}"
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr "Kaydedildi {0}"
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "Başarılı"
 
@@ -4809,7 +4889,7 @@ msgstr "Özet"
 msgid "Sunday"
 msgstr "Pazar"
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr "Yazı"
 msgid "Thanks and Regards"
 msgstr "Teşekkürler ve Saygılar"
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr "{0} kursuna artık {1} adresinden erişilebilir."
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr "Bu grupta boş yer bulunmamaktadır."
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr "Bu grupta hiç öğrenci bulunmamaktadır."
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr "Bu sitede {0} yok."
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr "Bu kursta:"
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr "Bu kurs ücretsizdir."
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "Alıcı"
 msgid "To Date"
 msgstr "Bitiş Tarihi"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr "Sisteminizden Resim, Video, Ses veya PDF yüklemek için ekle simgesine tıklayın ve menüden yüklemeyi seçin. Ardından derse eklemek istediğiniz dosyayı seçin ve dersinize eklensin."
 
@@ -5169,7 +5267,7 @@ msgstr "Toplam Kayıt"
 msgid "Travel"
 msgstr "Gezi"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr "Tekrar Deneyin"
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr "Türü"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr "Cevabınızı yazın"
 
@@ -5282,11 +5382,11 @@ msgstr "Şifreyi Güncelle"
 msgid "Upload"
 msgstr "Yükle"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr "Dosya Yükle"
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr "%{0} Yükleniyor"
 
@@ -5404,7 +5504,7 @@ msgstr "Çarşamba"
 msgid "Welcome to {0}!"
 msgstr "{0} Uygulamasına Hoş Geldiniz!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr "Bir İnceleme Yazın"
 msgid "Write a review"
 msgstr "Bir inceleme yazın"
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr "Cevabınızı buraya yazın"
 
@@ -5461,11 +5561,11 @@ msgstr "Cevabınızı buraya yazın"
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr "Bu gruba zaten kayıtlısınız."
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr "Bu kursa zaten kayıtlısınız."
 
@@ -5530,7 +5630,7 @@ msgstr "Herhangi bir bildiriminiz yok."
 msgid "You got"
 msgstr "Puanın"
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr "{0}% doğru cevap verdiniz ve {2} üzerinden {1} puan aldınız"
@@ -5551,7 +5651,7 @@ msgstr "Bu kursa zaten yorum eklediniz"
 msgid "You have been enrolled in this batch"
 msgstr "Bu gruba kayıt oldunuz"
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr "Bu kursa zaten kayıtlısınız"
 
@@ -5559,6 +5659,10 @@ msgstr "Bu kursa zaten kayıtlısınız"
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr "Herhangi bir kursa kaydolmadınız"
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr "Bu kurs için mentor olmak üzere başvuruda bulundunuz. Talebiniz şu anda inceleme aşamasındadır."
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr "Ödevi başarıyla teslim ettiniz."
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr "Puanınız"
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr "{0} Ayarları bulunamadı"
 
diff --git a/lms/locale/zh.po b/lms/locale/zh.po
index ef14007d..7c1c3a87 100644
--- a/lms/locale/zh.po
+++ b/lms/locale/zh.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: jannat@frappe.io\n"
-"POT-Creation-Date: 2024-12-27 16:04+0000\n"
-"PO-Revision-Date: 2024-12-31 03:29\n"
+"POT-Creation-Date: 2025-01-03 16:04+0000\n"
+"PO-Revision-Date: 2025-01-07 04:09\n"
 "Last-Translator: jannat@frappe.io\n"
 "Language-Team: Chinese Simplified\n"
 "MIME-Version: 1.0\n"
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Add a new question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:11
+#: frontend/src/components/AssessmentPlugin.vue:11
 msgid "Add a quiz to your lesson"
 msgstr ""
 
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Add an assessment"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:14
+msgid "Add an assignment to your lesson"
+msgstr ""
+
 #: frontend/src/components/Modals/Question.vue:18
 msgid "Add an existing question"
 msgstr ""
@@ -176,7 +180,7 @@ msgstr ""
 msgid "Add web page to sidebar"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:44
+#: frontend/src/components/Assignment.vue:65
 msgid "Add your assignment as {0}"
 msgstr ""
 
@@ -393,6 +397,8 @@ msgstr ""
 #. Label of the section_break_16 (Section Break) field in DocType 'Course
 #. Lesson'
 #. Label of the assignment (Link) field in DocType 'LMS Assignment Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:12
+#: frontend/src/utils/assignment.js:25
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
 #: lms/templates/assignment.html:3
@@ -417,15 +423,23 @@ msgstr ""
 msgid "Assignment Title"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:31
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:33
 msgid "Assignment for Lesson {0} by {1} already exists."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:155
+msgid "Assignment saved successfully"
+msgstr ""
+
 #. Description of the 'Question' (Small Text) field in DocType 'Course Lesson'
 #: lms/lms/doctype/course_lesson/course_lesson.json
 msgid "Assignment will appear at the bottom of the lesson."
 msgstr ""
 
+#: frontend/src/pages/AssignmentForm.vue:174
+msgid "Assignments"
+msgstr "作业"
+
 #: lms/lms/doctype/lms_question/lms_question.py:43
 msgid "At least one option must be correct for this question."
 msgstr ""
@@ -746,6 +760,10 @@ msgstr ""
 msgid "Change"
 msgstr "变化"
 
+#: frontend/src/components/Assignment.vue:316
+msgid "Changes saved successfully"
+msgstr ""
+
 #. Label of the chapter (Link) field in DocType 'Chapter Reference'
 #. Label of the chapter (Link) field in DocType 'LMS Course Progress'
 #. Label of a Link in the LMS Workspace
@@ -774,7 +792,7 @@ msgstr ""
 msgid "Chapters"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:201 lms/templates/quiz/quiz.html:120
+#: frontend/src/components/Quiz.vue:203 lms/templates/quiz/quiz.html:120
 msgid "Check"
 msgstr "检查"
 
@@ -797,7 +815,7 @@ msgstr ""
 msgid "Choices"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:581 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:587 lms/templates/quiz/quiz.html:53
 msgid "Choose all answers that apply"
 msgstr ""
 
@@ -805,7 +823,7 @@ msgstr ""
 msgid "Choose an icon"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:582 lms/templates/quiz/quiz.html:53
+#: frontend/src/components/Quiz.vue:588 lms/templates/quiz/quiz.html:53
 msgid "Choose one answer"
 msgstr ""
 
@@ -814,12 +832,16 @@ msgstr ""
 msgid "City"
 msgstr "城市"
 
+#: frontend/src/components/Controls/Link.vue:49
+msgid "Clear"
+msgstr "明确"
+
 #. Option for the 'Role Preference' (Select) field in DocType 'User'
 #: lms/fixtures/custom_field.json
 msgid "Clearly Defined Role"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:15
+#: frontend/src/components/LessonHelp.vue:30
 msgid "Click on the add icon in the editor and select Quiz from the menu. It opens up a dialog, where you can either select a quiz from the list or create a new quiz. When you select the Create New option it redirects you to the quiz creation page."
 msgstr ""
 
@@ -917,6 +939,7 @@ msgstr "颜色"
 #. Label of the comments (Small Text) field in DocType 'LMS Assignment
 #. Submission'
 #. Label of the comments (Small Text) field in DocType 'LMS Mentor Request'
+#: frontend/src/components/Assignment.vue:161
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -924,6 +947,10 @@ msgstr "颜色"
 msgid "Comments"
 msgstr "评论"
 
+#: frontend/src/components/Assignment.vue:139
+msgid "Comments by Evaluator"
+msgstr ""
+
 #. Label of the company (Data) field in DocType 'LMS Job Application'
 #. Label of the company (Data) field in DocType 'Work Experience'
 #: lms/job/doctype/lms_job_application/lms_job_application.json
@@ -986,7 +1013,7 @@ msgstr ""
 msgid "Completed"
 msgstr "已完成"
 
-#: frontend/src/components/BatchStudents.vue:325
+#: frontend/src/components/BatchStudents.vue:353
 msgid "Completed by Students"
 msgstr ""
 
@@ -1036,7 +1063,7 @@ msgid "Continue Learning"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:117
+#: frontend/src/pages/Jobs.vue:120
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Contract"
 msgstr "合同"
@@ -1045,7 +1072,7 @@ msgstr "合同"
 msgid "Cookie Policy"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:53
+#: frontend/src/components/LessonHelp.vue:68
 msgid "Copy the URL of the video from YouTube and paste it in the editor."
 msgstr ""
 
@@ -1057,7 +1084,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:161
+#: frontend/src/components/Quiz.vue:163
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Correct"
@@ -1197,7 +1224,7 @@ msgstr ""
 msgid "Course Name"
 msgstr ""
 
-#: frontend/src/pages/CourseDetail.vue:74
+#: frontend/src/pages/CourseDetail.vue:76
 msgid "Course Outline"
 msgstr ""
 
@@ -1322,6 +1349,10 @@ msgstr ""
 msgid "Create a new question"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:163
+msgid "Created"
+msgstr ""
+
 #. Label of the currency (Link) field in DocType 'Web Form'
 #. Label of the currency (Link) field in DocType 'LMS Batch'
 #. Label of the currency (Link) field in DocType 'LMS Course'
@@ -1487,8 +1518,8 @@ msgid "Desk"
 msgstr ""
 
 #: frontend/src/components/Modals/DiscussionModal.vue:22
-#: frontend/src/pages/BatchForm.vue:14 frontend/src/pages/CourseForm.vue:28
-#: frontend/src/pages/QuizForm.vue:42
+#: frontend/src/pages/AssignmentForm.vue:27 frontend/src/pages/BatchForm.vue:14
+#: frontend/src/pages/CourseForm.vue:28 frontend/src/pages/QuizForm.vue:42
 msgid "Details"
 msgstr "详细信息"
 
@@ -1619,6 +1650,10 @@ msgstr "发送电子邮件"
 msgid "Email Templates"
 msgstr ""
 
+#: frontend/src/components/BatchStudents.vue:409
+msgid "Email copied to clipboard"
+msgstr ""
+
 #. Label of the show_emails (Check) field in DocType 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
 msgid "Emails"
@@ -1699,8 +1734,8 @@ msgid "Enroll Now"
 msgstr ""
 
 #: frontend/src/components/CourseCard.vue:43
-#: frontend/src/components/CourseCardOverlay.vue:103
-#: frontend/src/pages/CourseDetail.vue:31
+#: frontend/src/components/CourseCardOverlay.vue:104
+#: frontend/src/pages/CourseDetail.vue:33
 msgid "Enrolled Students"
 msgstr ""
 
@@ -1717,7 +1752,7 @@ msgstr ""
 msgid "Enrollment Count"
 msgstr ""
 
-#: lms/lms/utils.py:1720
+#: lms/lms/utils.py:1726
 msgid "Enrollment Failed"
 msgstr ""
 
@@ -1733,7 +1768,7 @@ msgstr ""
 msgid "Enter Client Id and Client Secret in Google Settings to send calendar invites for evaluations."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:96
+#: frontend/src/components/Assignment.vue:110
 msgid "Enter a URL"
 msgstr ""
 
@@ -1745,6 +1780,7 @@ msgstr ""
 msgid "Enter the correct answer"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:268
 #: frontend/src/components/Modals/AnnouncementModal.vue:105
 #: frontend/src/components/Modals/BulkCertificates.vue:115
 #: frontend/src/components/Modals/ChapterModal.vue:159
@@ -1755,8 +1791,9 @@ msgstr ""
 #: frontend/src/components/Modals/Question.vue:326
 #: frontend/src/components/Modals/StudentModal.vue:69
 #: frontend/src/components/SettingDetails.vue:62
-#: frontend/src/pages/Billing.vue:264 frontend/src/pages/QuizForm.vue:350
-#: frontend/src/pages/QuizForm.vue:365
+#: frontend/src/pages/AssignmentForm.vue:139
+#: frontend/src/pages/AssignmentForm.vue:159 frontend/src/pages/Billing.vue:264
+#: frontend/src/pages/QuizForm.vue:346 frontend/src/pages/QuizForm.vue:361
 #: frontend/src/pages/QuizSubmission.vue:141
 msgid "Error"
 msgstr "错误"
@@ -1919,7 +1956,7 @@ msgstr ""
 msgid "Featured"
 msgstr "精选"
 
-#: frontend/src/pages/AssignmentSubmission.vue:21
+#: frontend/src/components/Assignment.vue:61
 msgid "Feel free to make edits to your submission if needed."
 msgstr ""
 
@@ -1938,6 +1975,10 @@ msgstr ""
 msgid "File Type"
 msgstr "文件类型"
 
+#: frontend/src/pages/Jobs.vue:47
+msgid "Find the perfect job for you"
+msgstr ""
+
 #: frontend/src/components/Members.vue:38
 #: frontend/src/components/Modals/EditProfile.vue:59
 msgid "First Name"
@@ -1953,7 +1994,7 @@ msgstr ""
 msgid "Flexible Time"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:463
+#: frontend/src/pages/QuizForm.vue:459
 msgid "Form to create and edit quizzes"
 msgstr ""
 
@@ -1967,7 +2008,7 @@ msgid "Free"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:118
+#: frontend/src/pages/Jobs.vue:121
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Freelance"
 msgstr ""
@@ -2009,7 +2050,7 @@ msgid "Full Name"
 msgstr "全名"
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:115
+#: frontend/src/pages/Jobs.vue:118
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Full Time"
 msgstr ""
@@ -2069,6 +2110,7 @@ msgid "Google Meet Link"
 msgstr ""
 
 #. Label of the grade (Data) field in DocType 'Education Detail'
+#: frontend/src/components/Assignment.vue:154
 #: lms/lms/doctype/education_detail/education_detail.json
 msgid "Grade"
 msgstr ""
@@ -2083,6 +2125,10 @@ msgstr ""
 msgid "Grade Type"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:149
+msgid "Grading"
+msgstr ""
+
 #. Label of the grant_only_once (Check) field in DocType 'LMS Badge'
 #: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "Grant only once"
@@ -2146,7 +2192,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:9
+#: frontend/src/components/LessonHelp.vue:24
 msgid "How to add a Quiz?"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgstr ""
 msgid "I am unavailable"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:384
+#: frontend/src/pages/QuizForm.vue:380
 msgid "ID"
 msgstr "ID"
 
@@ -2178,7 +2224,7 @@ msgstr "ID"
 msgid "Icon"
 msgstr "图标"
 
-#: frontend/src/components/LessonHelp.vue:68
+#: frontend/src/components/LessonHelp.vue:11
 msgid "If Include in Preview is enabled for a lesson then the lesson will also be accessible to non logged in users."
 msgstr ""
 
@@ -2261,7 +2307,7 @@ msgstr ""
 #. Option for the 'Status' (Select) field in DocType 'Exercise Latest
 #. Submission'
 #. Option for the 'Status' (Select) field in DocType 'Exercise Submission'
-#: frontend/src/components/Quiz.vue:166
+#: frontend/src/components/Quiz.vue:168
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
 #: lms/lms/doctype/exercise_submission/exercise_submission.json
 msgid "Incorrect"
@@ -2469,7 +2515,7 @@ msgstr ""
 msgid "Jobs"
 msgstr "工作"
 
-#: frontend/src/components/LiveClass.vue:55
+#: frontend/src/components/LiveClass.vue:58
 #: lms/templates/upcoming_evals.html:15
 msgid "Join"
 msgstr "加入"
@@ -2759,7 +2805,7 @@ msgstr ""
 #. Group in Course Chapter's connections
 #. Label of the lessons (Data) field in DocType 'LMS Course'
 #: frontend/src/components/CourseCard.vue:34
-#: frontend/src/components/CourseCardOverlay.vue:96
+#: frontend/src/components/CourseCardOverlay.vue:97
 #: lms/lms/doctype/course_chapter/course_chapter.json
 #: lms/lms/doctype/lms_course/lms_course.json
 msgid "Lessons"
@@ -2825,6 +2871,7 @@ msgid "LiveCode URL"
 msgstr ""
 
 #: frontend/src/components/Members.vue:106
+#: frontend/src/pages/Assignments.vue:71
 #: frontend/src/pages/QuizSubmissionList.vue:39
 #: frontend/src/pages/Quizzes.vue:51
 msgid "Load More"
@@ -2854,6 +2901,7 @@ msgstr "位置"
 msgid "Location Preference"
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:13
 #: frontend/src/components/NoPermission.vue:28
 #: frontend/src/components/QuizBlock.vue:9 frontend/src/pages/Batch.vue:175
 #: frontend/src/pages/Lesson.vue:24
@@ -2913,7 +2961,7 @@ msgstr ""
 #. Label of the marks (Int) field in DocType 'LMS Quiz Result'
 #: frontend/src/components/Modals/Question.vue:50
 #: frontend/src/components/Modals/Question.vue:99
-#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:394
+#: frontend/src/components/Quiz.vue:94 frontend/src/pages/QuizForm.vue:390
 #: frontend/src/pages/QuizSubmission.vue:59
 #: lms/lms/doctype/lms_quiz_question/lms_quiz_question.json
 #: lms/lms/doctype/lms_quiz_result/lms_quiz_result.json
@@ -2970,6 +3018,7 @@ msgstr "中:"
 #. Label of the member (Link) field in DocType 'LMS Payment'
 #. Label of the member (Link) field in DocType 'LMS Program Member'
 #. Label of the member (Link) field in DocType 'LMS Quiz Submission'
+#: frontend/src/pages/AssignmentSubmissionList.vue:14
 #: frontend/src/pages/QuizSubmission.vue:31
 #: frontend/src/pages/QuizSubmissionList.vue:86
 #: lms/lms/doctype/exercise_latest_submission/exercise_latest_submission.json
@@ -3140,11 +3189,11 @@ msgstr ""
 msgid "Modified By"
 msgstr "修改者"
 
-#: lms/lms/api.py:199
+#: lms/lms/api.py:201
 msgid "Module Name is incorrect or does not exist."
 msgstr ""
 
-#: lms/lms/api.py:195
+#: lms/lms/api.py:197
 msgid "Module is incorrect."
 msgstr ""
 
@@ -3173,12 +3222,17 @@ msgid "My calendar"
 msgstr ""
 
 #. Option for the 'Event' (Select) field in DocType 'LMS Badge'
-#: frontend/src/pages/Batches.vue:30 frontend/src/pages/Courses.vue:45
-#: frontend/src/pages/Programs.vue:14 lms/lms/doctype/lms_badge/lms_badge.json
+#: frontend/src/pages/Assignments.vue:18 frontend/src/pages/Batches.vue:30
+#: frontend/src/pages/Courses.vue:45 frontend/src/pages/Programs.vue:14
+#: lms/lms/doctype/lms_badge/lms_badge.json
 msgid "New"
 msgstr "新"
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:41
+#: frontend/src/pages/AssignmentForm.vue:178
+msgid "New Assignment"
+msgstr ""
+
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:43
 msgid "New Assignment Submission"
 msgstr ""
 
@@ -3214,7 +3268,7 @@ msgstr ""
 msgid "New Question"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:454 frontend/src/pages/QuizForm.vue:462
+#: frontend/src/pages/QuizForm.vue:450 frontend/src/pages/QuizForm.vue:458
 #: frontend/src/pages/Quizzes.vue:18
 msgid "New Quiz"
 msgstr ""
@@ -3236,7 +3290,7 @@ msgstr ""
 msgid "New {0}"
 msgstr "新建 {0}"
 
-#: frontend/src/components/Quiz.vue:209 frontend/src/pages/Lesson.vue:84
+#: frontend/src/components/Quiz.vue:211 frontend/src/pages/Lesson.vue:84
 msgid "Next"
 msgstr "下一个"
 
@@ -3244,7 +3298,7 @@ msgstr "下一个"
 msgid "Next Question"
 msgstr ""
 
-#: frontend/src/components/Assessments.vue:66 lms/templates/assessments.html:58
+#: frontend/src/components/Assessments.vue:75 lms/templates/assessments.html:58
 msgid "No Assessments"
 msgstr ""
 
@@ -3265,6 +3319,10 @@ msgstr ""
 msgid "No announcements"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:56
+msgid "No assignments found"
+msgstr ""
+
 #: frontend/src/pages/Batches.vue:125
 msgid "No batches found"
 msgstr ""
@@ -3293,11 +3351,11 @@ msgstr ""
 msgid "No introduction"
 msgstr ""
 
-#: frontend/src/pages/Jobs.vue:60
+#: frontend/src/pages/Jobs.vue:63
 msgid "No jobs posted"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:61
+#: frontend/src/components/LiveClass.vue:71
 msgid "No live classes scheduled"
 msgstr ""
 
@@ -3313,6 +3371,10 @@ msgstr ""
 msgid "No slots available for this date."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:67
+msgid "No submissions"
+msgstr ""
+
 #: frontend/src/components/UpcomingEvaluations.vue:39
 msgid "No upcoming evaluations."
 msgstr ""
@@ -3361,6 +3423,7 @@ msgstr ""
 msgid "Not Permitted"
 msgstr "不允许"
 
+#: frontend/src/components/Assignment.vue:33
 #: frontend/src/components/BrandSettings.vue:10
 #: frontend/src/components/PaymentSettings.vue:9
 #: frontend/src/components/SettingDetails.vue:10
@@ -3404,7 +3467,7 @@ msgstr ""
 msgid "Once again, congratulations on this significant accomplishment."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:17
+#: frontend/src/components/Assignment.vue:57
 msgid "Once the moderator grades your submission, you'll find the details here."
 msgstr ""
 
@@ -3421,7 +3484,7 @@ msgstr ""
 msgid "Only files of type {0} will be accepted."
 msgstr ""
 
-#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:527
+#: frontend/src/pages/CourseForm.vue:498 frontend/src/utils/index.js:529
 msgid "Only image file is allowed."
 msgstr ""
 
@@ -3550,7 +3613,7 @@ msgid "Pan Number"
 msgstr ""
 
 #. Option for the 'Type' (Select) field in DocType 'Job Opportunity'
-#: frontend/src/pages/Jobs.vue:116
+#: frontend/src/pages/Jobs.vue:119
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 msgid "Part Time"
 msgstr ""
@@ -3681,7 +3744,7 @@ msgstr ""
 msgid "Phone Number"
 msgstr "电话号码"
 
-#: frontend/src/components/CourseCardOverlay.vue:141
+#: frontend/src/components/CourseCardOverlay.vue:145
 msgid "Please Login"
 msgstr ""
 
@@ -3701,7 +3764,7 @@ msgstr "请检查您的电子邮件验证"
 msgid "Please click on the following button to set your new password"
 msgstr ""
 
-#: lms/lms/utils.py:1842 lms/lms/utils.py:1846
+#: lms/lms/utils.py:1848 lms/lms/utils.py:1852
 msgid "Please complete the previous courses in the program to enroll in this course."
 msgstr ""
 
@@ -3721,8 +3784,8 @@ msgstr ""
 msgid "Please enter a title."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:38
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:98
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:40
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:122
 msgid "Please enter a valid URL."
 msgstr ""
 
@@ -3730,7 +3793,7 @@ msgstr ""
 msgid "Please enter a valid time in the format HH:mm."
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:92
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:116
 msgid "Please enter the URL for assignment submission."
 msgstr ""
 
@@ -3750,6 +3813,10 @@ msgstr ""
 msgid "Please let us know where you heard about us from."
 msgstr ""
 
+#: frontend/src/components/AssignmentBlock.vue:9
+msgid "Please login to access the assignment."
+msgstr ""
+
 #: frontend/src/components/QuizBlock.vue:5
 msgid "Please login to access the quiz."
 msgstr ""
@@ -3758,7 +3825,7 @@ msgstr ""
 msgid "Please login to access this page."
 msgstr ""
 
-#: lms/lms/api.py:191
+#: lms/lms/api.py:193
 msgid "Please login to continue with payment."
 msgstr ""
 
@@ -3795,7 +3862,7 @@ msgstr ""
 msgid "Please upload a SCORM package"
 msgstr ""
 
-#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:95
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:119
 msgid "Please upload the assignment file."
 msgstr ""
 
@@ -4003,9 +4070,9 @@ msgstr ""
 #. Label of the question (Text Editor) field in DocType 'LMS Question'
 #. Label of the question (Link) field in DocType 'LMS Quiz Question'
 #. Label of the question (Text) field in DocType 'LMS Quiz Result'
+#: frontend/src/components/Assignment.vue:17
 #: frontend/src/components/Modals/Question.vue:38
-#: frontend/src/pages/AssignmentSubmission.vue:26
-#: frontend/src/pages/QuizForm.vue:389
+#: frontend/src/pages/AssignmentForm.vue:45 frontend/src/pages/QuizForm.vue:385
 #: lms/lms/doctype/course_lesson/course_lesson.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
 #: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.json
@@ -4042,7 +4109,7 @@ msgstr ""
 msgid "Question {0}"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:186
+#: frontend/src/components/Quiz.vue:188
 msgid "Question {0} of {1}"
 msgstr ""
 
@@ -4051,7 +4118,7 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/QuizForm.vue:427
 msgid "Questions deleted successfully"
 msgstr ""
 
@@ -4079,7 +4146,7 @@ msgstr ""
 msgid "Quiz Submissions"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:223
+#: frontend/src/components/Quiz.vue:225
 msgid "Quiz Summary"
 msgstr ""
 
@@ -4088,7 +4155,7 @@ msgstr ""
 msgid "Quiz Title"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:343
+#: frontend/src/pages/QuizForm.vue:339
 msgid "Quiz created successfully"
 msgstr ""
 
@@ -4096,7 +4163,7 @@ msgstr ""
 msgid "Quiz is not available to Guest users. Please login to continue."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:362
+#: frontend/src/pages/QuizForm.vue:358
 msgid "Quiz updated successfully"
 msgstr ""
 
@@ -4105,7 +4172,7 @@ msgstr ""
 msgid "Quiz will appear at the bottom of the lesson."
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:442 frontend/src/pages/Quizzes.vue:138
+#: frontend/src/pages/QuizForm.vue:438 frontend/src/pages/Quizzes.vue:138
 #: frontend/src/pages/Quizzes.vue:148
 msgid "Quizzes"
 msgstr ""
@@ -4113,7 +4180,7 @@ msgstr ""
 #. Label of the rating (Rating) field in DocType 'LMS Certificate Evaluation'
 #. Label of the rating (Data) field in DocType 'LMS Course'
 #. Label of the rating (Rating) field in DocType 'LMS Course Review'
-#: frontend/src/components/CourseCardOverlay.vue:108
+#: frontend/src/components/CourseCardOverlay.vue:110
 #: frontend/src/components/Modals/Event.vue:86
 #: frontend/src/components/Modals/ReviewModal.vue:20
 #: lms/lms/doctype/lms_certificate_evaluation/lms_certificate_evaluation.json
@@ -4127,10 +4194,6 @@ msgstr ""
 msgid "Rating cannot be 0"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:30
-msgid "Read the question carefully before attempting the assignment."
-msgstr ""
-
 #. Option for the 'Stage' (Select) field in DocType 'LMS Batch Old'
 #: lms/lms/doctype/lms_batch_old/lms_batch_old.json
 msgid "Ready"
@@ -4309,15 +4372,15 @@ msgstr ""
 msgid "Saturday"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:34
+#: frontend/src/components/Assignment.vue:43
 #: frontend/src/components/Controls/CodeEditor.vue:25
 #: frontend/src/components/Modals/Event.vue:101
 #: frontend/src/components/Modals/Event.vue:129
-#: frontend/src/components/QuizPlugin.vue:23
-#: frontend/src/pages/AssignmentSubmission.vue:7
-#: frontend/src/pages/BatchForm.vue:8 frontend/src/pages/CourseForm.vue:20
-#: frontend/src/pages/JobCreation.vue:8 frontend/src/pages/LessonForm.vue:14
-#: frontend/src/pages/ProgramForm.vue:7 frontend/src/pages/QuizForm.vue:34
-#: frontend/src/pages/QuizSubmission.vue:14
+#: frontend/src/pages/AssignmentForm.vue:21 frontend/src/pages/BatchForm.vue:8
+#: frontend/src/pages/CourseForm.vue:20 frontend/src/pages/JobCreation.vue:8
+#: frontend/src/pages/LessonForm.vue:14 frontend/src/pages/ProgramForm.vue:7
+#: frontend/src/pages/QuizForm.vue:34 frontend/src/pages/QuizSubmission.vue:14
 #: lms/public/js/common_functions.js:405
 msgid "Save"
 msgstr "保存"
@@ -4359,6 +4422,10 @@ msgstr ""
 msgid "Search"
 msgstr "搜索"
 
+#: frontend/src/pages/Assignments.vue:25
+msgid "Search by title"
+msgstr ""
+
 #: frontend/src/components/Controls/IconPicker.vue:36
 msgid "Search for an icon"
 msgstr ""
@@ -4384,7 +4451,7 @@ msgstr ""
 msgid "Select a question"
 msgstr ""
 
-#: frontend/src/components/QuizPlugin.vue:17
+#: frontend/src/components/AssessmentPlugin.vue:21
 msgid "Select a quiz"
 msgstr ""
 
@@ -4392,6 +4459,10 @@ msgstr ""
 msgid "Select a slot"
 msgstr ""
 
+#: frontend/src/components/AssessmentPlugin.vue:28
+msgid "Select an assignment"
+msgstr ""
+
 #. Label of the send_calendar_invite_for_evaluations (Check) field in DocType
 #. 'LMS Settings'
 #: lms/lms/doctype/lms_settings/lms_settings.json
@@ -4583,7 +4654,7 @@ msgstr ""
 msgid "Stage"
 msgstr ""
 
-#: frontend/src/components/LiveClass.vue:46 frontend/src/components/Quiz.vue:65
+#: frontend/src/components/LiveClass.vue:50 frontend/src/components/Quiz.vue:65
 #: lms/templates/quiz/quiz.html:39
 msgid "Start"
 msgstr "开始"
@@ -4664,6 +4735,7 @@ msgstr ""
 #. Label of the status (Select) field in DocType 'LMS Course Progress'
 #. Label of the status (Select) field in DocType 'LMS Mentor Request'
 #: frontend/src/components/Modals/Event.vue:91
+#: frontend/src/pages/AssignmentSubmissionList.vue:19
 #: frontend/src/pages/JobCreation.vue:41
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/cohort/cohort.json
@@ -4724,7 +4796,7 @@ msgstr ""
 msgid "Students"
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:282
+#: frontend/src/components/BatchStudents.vue:310
 msgid "Students deleted successfully"
 msgstr ""
 
@@ -4746,19 +4818,24 @@ msgstr ""
 msgid "Subject"
 msgstr "主题"
 
-#: frontend/src/pages/AssignmentSubmission.vue:40
+#: frontend/src/components/Assignment.vue:29
 msgid "Submission"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:30
+#: frontend/src/pages/AssignmentForm.vue:17 frontend/src/pages/QuizForm.vue:30
 msgid "Submission List"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:10
+#: frontend/src/components/Assignment.vue:13
+msgid "Submission by"
+msgstr ""
+
 #: frontend/src/components/Modals/AssessmentModal.vue:9
 #: frontend/src/components/Modals/BatchCourseModal.vue:9
 #: frontend/src/components/Modals/EvaluationModal.vue:9
 #: frontend/src/components/Modals/Question.vue:338
-#: frontend/src/components/Quiz.vue:214 lms/templates/assignment.html:9
+#: frontend/src/components/Quiz.vue:216 lms/templates/assignment.html:9
 #: lms/templates/livecode/extension_footer.html:25
 #: lms/templates/quiz/quiz.html:128 lms/templates/reviews.html:163
 #: lms/www/new-sign-up.html:32
@@ -4774,10 +4851,12 @@ msgstr ""
 msgid "Submitted {0}"
 msgstr ""
 
+#: frontend/src/components/Assignment.vue:316
 #: frontend/src/components/BatchCourses.vue:150
 #: frontend/src/components/BatchOverlay.vue:135
-#: frontend/src/components/BatchStudents.vue:282
-#: frontend/src/components/CourseCardOverlay.vue:161
+#: frontend/src/components/BatchStudents.vue:310
+#: frontend/src/components/BatchStudents.vue:409
+#: frontend/src/components/CourseCardOverlay.vue:165
 #: frontend/src/components/Modals/AnnouncementModal.vue:99
 #: frontend/src/components/Modals/AssessmentModal.vue:73
 #: frontend/src/components/Modals/BulkCertificates.vue:121
@@ -4787,11 +4866,12 @@ msgstr ""
 #: frontend/src/components/Modals/Event.vue:310
 #: frontend/src/components/Modals/Question.vue:264
 #: frontend/src/components/Modals/Question.vue:315
+#: frontend/src/pages/AssignmentForm.vue:155
 #: frontend/src/pages/CourseForm.vue:461 frontend/src/pages/ProgramForm.vue:229
 #: frontend/src/pages/ProgramForm.vue:251
 #: frontend/src/pages/ProgramForm.vue:272
-#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:343
-#: frontend/src/pages/QuizForm.vue:362 frontend/src/pages/QuizForm.vue:431
+#: frontend/src/pages/ProgramForm.vue:298 frontend/src/pages/QuizForm.vue:339
+#: frontend/src/pages/QuizForm.vue:358 frontend/src/pages/QuizForm.vue:427
 msgid "Success"
 msgstr "成功"
 
@@ -4809,7 +4889,7 @@ msgstr "概要"
 msgid "Sunday"
 msgstr ""
 
-#: lms/lms/api.py:952
+#: lms/lms/api.py:954
 msgid "Suspicious pattern found in {0}: {1}"
 msgstr ""
 
@@ -4924,6 +5004,10 @@ msgstr ""
 msgid "Thanks and Regards"
 msgstr ""
 
+#: lms/lms/utils.py:1755
+msgid "The batch is full. Please contact the Administrator."
+msgstr ""
+
 #: lms/templates/emails/lms_course_interest.html:5
 msgid "The course {0} is now available on {1}."
 msgstr ""
@@ -4964,14 +5048,22 @@ msgstr ""
 msgid "There are no seats available in this batch."
 msgstr ""
 
-#: frontend/src/components/BatchStudents.vue:165
+#: frontend/src/components/BatchStudents.vue:182
 msgid "There are no students in this batch."
 msgstr ""
 
+#: frontend/src/pages/AssignmentSubmissionList.vue:70
+msgid "There are no submissions for this assignment."
+msgstr ""
+
 #: lms/templates/course_list.html:14
 msgid "There are no {0} on this site."
 msgstr ""
 
+#: lms/lms/doctype/lms_assignment_submission/lms_assignment_submission.py:82
+msgid "There has been an update on your submission for assignment {0}"
+msgstr ""
+
 #: lms/lms/doctype/lms_quiz_submission/lms_quiz_submission.py:42
 msgid "There has been an update on your submission. You have got a score of {0} for the quiz {1}"
 msgstr ""
@@ -4991,11 +5083,15 @@ msgstr ""
 msgid "This certificate does no expire"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:91
+#: frontend/src/components/LiveClass.vue:64
+msgid "This class has ended"
+msgstr ""
+
+#: frontend/src/components/CourseCardOverlay.vue:92
 msgid "This course has:"
 msgstr ""
 
-#: lms/lms/utils.py:1600
+#: lms/lms/utils.py:1606
 msgid "This course is free."
 msgstr ""
 
@@ -5098,10 +5194,12 @@ msgstr ""
 #. Label of the title (Data) field in DocType 'Work Experience'
 #: frontend/src/components/Modals/DiscussionModal.vue:18
 #: frontend/src/components/Modals/LiveClassModal.vue:23
-#: frontend/src/pages/BatchForm.vue:20 frontend/src/pages/CourseForm.vue:32
-#: frontend/src/pages/JobCreation.vue:20 frontend/src/pages/ProgramForm.vue:11
-#: frontend/src/pages/Programs.vue:118 frontend/src/pages/QuizForm.vue:48
-#: frontend/src/pages/Quizzes.vue:116 lms/lms/doctype/cohort/cohort.json
+#: frontend/src/pages/AssignmentForm.vue:32
+#: frontend/src/pages/Assignments.vue:152 frontend/src/pages/BatchForm.vue:20
+#: frontend/src/pages/CourseForm.vue:32 frontend/src/pages/JobCreation.vue:20
+#: frontend/src/pages/ProgramForm.vue:11 frontend/src/pages/Programs.vue:118
+#: frontend/src/pages/QuizForm.vue:48 frontend/src/pages/Quizzes.vue:116
+#: lms/lms/doctype/cohort/cohort.json
 #: lms/lms/doctype/cohort_subgroup/cohort_subgroup.json
 #: lms/lms/doctype/cohort_web_page/cohort_web_page.json
 #: lms/lms/doctype/course_chapter/course_chapter.json
@@ -5137,11 +5235,11 @@ msgstr "至"
 msgid "To Date"
 msgstr "至今"
 
-#: lms/lms/utils.py:1611
+#: lms/lms/utils.py:1617
 msgid "To join this batch, please contact the Administrator."
 msgstr ""
 
-#: frontend/src/components/LessonHelp.vue:34
+#: frontend/src/components/LessonHelp.vue:49
 msgid "To upload Image, Video, Audio or PDF from your system, click on the add icon and select upload from the menu. Then choose the file you want to add to the lesson and it gets added to your lesson."
 msgstr ""
 
@@ -5169,7 +5267,7 @@ msgstr ""
 msgid "Travel"
 msgstr "出差"
 
-#: frontend/src/components/Quiz.vue:252 lms/templates/quiz/quiz.html:131
+#: frontend/src/components/Quiz.vue:254 lms/templates/quiz/quiz.html:131
 msgid "Try Again"
 msgstr ""
 
@@ -5191,6 +5289,8 @@ msgstr ""
 #. Label of the type (Select) field in DocType 'LMS Quiz Question'
 #: frontend/src/components/Modals/AssessmentModal.vue:22
 #: frontend/src/components/Modals/Question.vue:54
+#: frontend/src/pages/AssignmentForm.vue:39
+#: frontend/src/pages/Assignments.vue:30 frontend/src/pages/Assignments.vue:157
 #: frontend/src/pages/JobCreation.vue:33 frontend/src/pages/Jobs.vue:16
 #: lms/job/doctype/job_opportunity/job_opportunity.json
 #: lms/lms/doctype/lms_assignment/lms_assignment.json
@@ -5201,7 +5301,7 @@ msgstr ""
 msgid "Type"
 msgstr "类型"
 
-#: frontend/src/components/Quiz.vue:583
+#: frontend/src/components/Quiz.vue:589
 msgid "Type your answer"
 msgstr ""
 
@@ -5282,11 +5382,11 @@ msgstr ""
 msgid "Upload"
 msgstr "上传"
 
-#: frontend/src/pages/AssignmentSubmission.vue:69
+#: frontend/src/components/Assignment.vue:78
 msgid "Upload File"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:68
+#: frontend/src/components/Assignment.vue:77
 msgid "Uploading {0}%"
 msgstr ""
 
@@ -5404,7 +5504,7 @@ msgstr ""
 msgid "Welcome to {0}!"
 msgstr "欢迎{0}!"
 
-#: frontend/src/components/LessonHelp.vue:63
+#: frontend/src/components/LessonHelp.vue:6
 msgid "What does include in preview mean?"
 msgstr ""
 
@@ -5453,7 +5553,7 @@ msgstr ""
 msgid "Write a review"
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:102
+#: frontend/src/components/Assignment.vue:120
 msgid "Write your answer here"
 msgstr ""
 
@@ -5461,11 +5561,11 @@ msgstr ""
 msgid "You already have an evaluation on {0} at {1} for the course {2}."
 msgstr ""
 
-#: lms/lms/api.py:215
+#: lms/lms/api.py:217
 msgid "You are already enrolled for this batch."
 msgstr ""
 
-#: lms/lms/api.py:207
+#: lms/lms/api.py:209
 msgid "You are already enrolled for this course."
 msgstr ""
 
@@ -5530,7 +5630,7 @@ msgstr ""
 msgid "You got"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:234
+#: frontend/src/components/Quiz.vue:236
 #, python-format
 msgid "You got {0}% correct answers with a score of {1} out of {2}"
 msgstr ""
@@ -5551,7 +5651,7 @@ msgstr ""
 msgid "You have been enrolled in this batch"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:162
+#: frontend/src/components/CourseCardOverlay.vue:166
 msgid "You have been enrolled in this course"
 msgstr ""
 
@@ -5559,6 +5659,10 @@ msgstr ""
 msgid "You have got a score of {0} for the quiz {1}"
 msgstr ""
 
+#: frontend/src/pages/Assignments.vue:60
+msgid "You have not created any assignments yet. To create a new assignment, click on the \"New\" button above."
+msgstr ""
+
 #: frontend/src/pages/Quizzes.vue:65
 msgid "You have not created any quizzes yet. To create a new quiz, click on the \"New Quiz\" button above."
 msgstr ""
@@ -5571,7 +5675,7 @@ msgstr ""
 msgid "You haven't enrolled for any courses"
 msgstr ""
 
-#: frontend/src/components/CourseCardOverlay.vue:142
+#: frontend/src/components/CourseCardOverlay.vue:146
 msgid "You need to login first to enroll for this course"
 msgstr ""
 
@@ -5584,7 +5688,7 @@ msgstr ""
 msgid "You've applied to become a mentor for this course. Your request is currently under review."
 msgstr ""
 
-#: frontend/src/pages/AssignmentSubmission.vue:15
+#: frontend/src/components/Assignment.vue:55
 msgid "You've successfully submitted the assignment."
 msgstr ""
 
@@ -5628,7 +5732,7 @@ msgstr ""
 msgid "Your score is"
 msgstr ""
 
-#: frontend/src/components/Quiz.vue:227
+#: frontend/src/components/Quiz.vue:229
 msgid "Your submission has been successfully saved. The instructor will review and grade it shortly, and you'll be notified of your final result."
 msgstr ""
 
@@ -5677,7 +5781,7 @@ msgstr ""
 msgid "posted by"
 msgstr ""
 
-#: frontend/src/pages/QuizForm.vue:390
+#: frontend/src/pages/QuizForm.vue:386
 msgid "question_detail"
 msgstr ""
 
@@ -5693,7 +5797,7 @@ msgstr ""
 msgid "you can"
 msgstr ""
 
-#: lms/lms/api.py:749 lms/lms/api.py:757
+#: lms/lms/api.py:751 lms/lms/api.py:759
 msgid "{0} Settings not found"
 msgstr ""
 
diff --git a/lms/patches.txt b/lms/patches.txt
index c365311d..5ecffe3d 100644
--- a/lms/patches.txt
+++ b/lms/patches.txt
@@ -95,4 +95,5 @@ lms.patches.v2_0.add_course_statistics #21-10-2024
 lms.patches.v2_0.give_discussions_permissions
 lms.patches.v2_0.delete_web_forms
 lms.patches.v2_0.update_desk_access_for_lms_roles
-lms.patches.v2_0.update_quiz_submission_data
\ No newline at end of file
+lms.patches.v2_0.update_quiz_submission_data
+lms.patches.v2_0.convert_quiz_duration_to_minutes
\ No newline at end of file
diff --git a/lms/patches/v2_0/convert_quiz_duration_to_minutes.py b/lms/patches/v2_0/convert_quiz_duration_to_minutes.py
new file mode 100644
index 00000000..171c5fb9
--- /dev/null
+++ b/lms/patches/v2_0/convert_quiz_duration_to_minutes.py
@@ -0,0 +1,10 @@
+import frappe
+from frappe.utils import ceil, flt
+
+
+def execute():
+	quizzes = frappe.get_all(
+		"LMS Quiz", fields=["name", "duration"], filters={"duration": [">", 0]}
+	)
+	for quiz in quizzes:
+		frappe.db.set_value("LMS Quiz", quiz.name, "duration", ceil(flt(quiz.duration) / 60))