- {{
- submissionResource.doc.assignment_attachment
- .split('/')
- .pop()
- }}
+ {{ attachment.split('/').pop() }}
@@ -138,6 +140,7 @@
@change="(val) => (answer = val)"
:editable="true"
:fixedMenu="true"
+ :readonly="!canModifyAssignment"
:uploadArgs="{
private: true,
}"
@@ -150,7 +153,7 @@
user.data?.name == submissionResource.doc?.owner &&
submissionResource.doc?.comments
"
- class="mt-8 p-3 border rounded-lg"
+ class="mt-8 p-3 border rounded-lg bg-surface-gray-2"
>
{{ __('Comments by Evaluator') }}
@@ -213,8 +216,10 @@ import {
import { computed, inject, onMounted, onBeforeUnmount, ref, watch } from 'vue'
import { FileText, X } from 'lucide-vue-next'
import { useRouter } from 'vue-router'
+import { validateFile } from '@/utils'
const answer = ref(null)
+const attachment = ref(null)
const comments = ref(null)
const router = useRouter()
const user = inject('$user')
@@ -264,118 +269,98 @@ const assignment = createResource({
},
})
-const newSubmission = createResource({
- url: 'frappe.client.insert',
- makeParams(values) {
- let doc = {
- doctype: 'LMS Assignment Submission',
- assignment: props.assignmentID,
- member: user.data?.name,
- }
- if (!showUploader()) {
- doc.answer = answer.value
- }
- return {
- doc: doc,
- }
- },
-})
-
const submissionResource = createDocumentResource({
doctype: 'LMS Assignment Submission',
name: props.submissionName,
+ auto: false,
onError(err) {
toast.error(err.messages?.[0] || err)
},
- auto: false,
- cache: [user.data?.name, props.assignmentID],
})
watch(submissionResource, () => {
- if (submissionResource.doc) {
- if (submissionResource.doc.answer) {
- answer.value = submissionResource.doc.answer
- }
- if (submissionResource.doc.comments) {
- comments.value = submissionResource.doc.comments
- }
- if (submissionResource.isDirty) {
- isDirty.value = true
- } else if (
- showUploader() &&
- !submissionResource.doc.assignment_attachment
- ) {
- isDirty.value = true
- } else if (!showUploader() && !answer.value) {
- isDirty.value = true
- } else {
- isDirty.value = false
- }
+ if (!submissionResource.doc) return
+ console.log(submissionResource.doc)
+ if (submissionResource.doc.answer) {
+ answer.value = submissionResource.doc.answer
+ }
+ if (submissionResource.doc.assignment_attachment) {
+ attachment.value = submissionResource.doc.assignment_attachment
+ }
+ if (submissionResource.doc.comments) {
+ comments.value = submissionResource.doc.comments
}
})
-watch(
- () => submissionResource.doc,
- () => {
- if (
- props.submissionName == 'new' &&
- submissionResource.doc?.assignment_attachment
- ) {
- isDirty.value = true
- }
- }
-)
-
const submitAssignment = () => {
if (props.submissionName != 'new') {
- let evaluator =
- submissionResource.doc && submissionResource.doc.owner != user.data?.name
- ? user.data?.name
- : null
-
- submissionResource.setValue.submit(
- {
- ...submissionResource.doc,
- evaluator: evaluator,
- comments: comments.value,
- answer: answer.value,
- },
- {
- onSuccess(data) {
- isDirty.value = false
- toast.success(__('Changes saved successfully'))
- },
- }
- )
+ updateSubmission()
} else {
addNewSubmission()
}
}
const addNewSubmission = () => {
- newSubmission.submit(
- {},
+ let doc = {
+ doctype: 'LMS Assignment Submission',
+ assignment: props.assignmentID,
+ member: user.data?.name,
+ }
+ if (!showUploader()) {
+ doc.answer = answer.value
+ } else {
+ doc.assignment_attachment = attachment.value
+ }
+ call('frappe.client.insert', {
+ doc: doc,
+ })
+ .then((data) => {
+ toast.success(__('Assignment submitted successfully'))
+ if (router.currentRoute.value.name == 'AssignmentSubmission') {
+ router.push({
+ name: 'AssignmentSubmission',
+ params: {
+ assignmentID: props.assignmentID,
+ submissionName: data.name,
+ },
+ query: { fromLesson: router.currentRoute.value.query.fromLesson },
+ })
+ } else {
+ markLessonProgress()
+ router.go()
+ }
+ isDirty.value = false
+ submissionResource.name = data.name
+ submissionResource.reload()
+ })
+ .catch((err) => {
+ toast.error(err.messages?.[0] || err)
+ console.error(err)
+ })
+}
+
+const updateSubmission = () => {
+ let evaluator =
+ submissionResource.doc && submissionResource.doc.owner != user.data?.name
+ ? user.data?.name
+ : null
+
+ submissionResource.setValue.submit(
+ {
+ ...submissionResource.doc,
+ evaluator: evaluator,
+ comments: comments.value,
+ answer: answer.value,
+ assignment_attachment: attachment.value,
+ },
{
onSuccess(data) {
- toast.success(__('Assignment submitted successfully'))
- if (router.currentRoute.value.name == 'AssignmentSubmission') {
- router.push({
- name: 'AssignmentSubmission',
- params: {
- assignmentID: props.assignmentID,
- submissionName: data.name,
- },
- query: { fromLesson: router.currentRoute.value.query.fromLesson },
- })
- } else {
- markLessonProgress()
- router.go()
- }
- submissionResource.name = data.name
- submissionResource.reload()
+ isDirty.value = false
+ toast.success(__('Changes saved successfully'))
},
onError(err) {
toast.error(err.messages?.[0] || err)
+ console.error(err)
},
}
)
@@ -383,7 +368,7 @@ const addNewSubmission = () => {
const saveSubmission = (file) => {
isDirty.value = true
- submissionResource.doc.assignment_attachment = file.file_url
+ attachment.value = file.file_url
}
const markLessonProgress = () => {
@@ -417,21 +402,6 @@ const getType = () => {
}
}
-const validateFile = (file) => {
- let type = assignment.data?.type
- let extension = file.name.split('.').pop().toLowerCase()
- if (type == 'Image' && !['jpg', 'jpeg', 'png'].includes(extension)) {
- return 'Only image file is allowed.'
- } else if (
- type == 'Document' &&
- !['doc', 'docx', 'xml'].includes(extension)
- ) {
- return 'Only document file is allowed.'
- } else if (type == 'PDF' && !['pdf'].includes(extension)) {
- return 'Only PDF file is allowed.'
- }
-}
-
const removeSubmission = () => {
isDirty.value = true
submissionResource.doc.assignment_attachment = ''
diff --git a/frontend/src/components/BatchDashboard.vue b/frontend/src/components/BatchDashboard.vue
deleted file mode 100644
index d7639490..00000000
--- a/frontend/src/components/BatchDashboard.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
diff --git a/frontend/src/components/LiveClass.vue b/frontend/src/components/LiveClass.vue
deleted file mode 100644
index fffbd23a..00000000
--- a/frontend/src/components/LiveClass.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-
diff --git a/frontend/src/components/BatchStudents.vue b/frontend/src/components/BatchStudents.vue
deleted file mode 100644
index 7d3e0bc9..00000000
--- a/frontend/src/components/BatchStudents.vue
+++ /dev/null
@@ -1,226 +0,0 @@
-
-
-
-
-
-
-
-
- {{ studentCount.data ?? 0 }} {{ __('Students') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ row[column.key] }}%
-
- {{ row[column.key] }}
-
-
-
-
-
-
-
-
-
- {{ __('There are no students in this batch.') }}
-
-
-
-
{{ __(label) }}
*
-
-
-
-
-
@@ -100,15 +147,15 @@ import {
ComboboxInput,
ComboboxOptions,
ComboboxOption,
- ComboboxButton,
} from '@headlessui/vue'
+import { Popover } from 'frappe-ui'
+import { ChevronDown, X } from 'lucide-vue-next'
import { ref, computed, useAttrs, useSlots, watch, nextTick } from 'vue'
-import { watchDebounced } from '@vueuse/core'
const props = defineProps({
modelValue: {
- type: [String, Object],
- default: null,
+ type: String,
+ default: '',
},
options: {
type: Array,
@@ -139,93 +186,107 @@ const props = defineProps({
default: true,
},
})
-
const emit = defineEmits(['update:modelValue', 'update:query', 'change'])
-const trigger = ref(null)
+
+const query = ref('')
+const showOptions = ref(false)
const search = ref(null)
+
const attrs = useAttrs()
const slots = useSlots()
-const selectedValue = ref(props.modelValue)
-const query = ref('')
+
const valuePropPassed = computed(() => 'value' in attrs)
-watch(selectedValue, (val) => {
- query.value = ''
- emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
+const selectedValue = computed({
+ get() {
+ return valuePropPassed.value ? attrs.value : props.modelValue
+ },
+ set(val) {
+ query.value = ''
+ if (val) {
+ showOptions.value = false
+ }
+ emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
+ },
})
-function clearValue() {
- emit('update:modelValue', null)
+function close() {
+ showOptions.value = false
}
const groups = computed(() => {
- if (!props.options?.length) return []
+ if (!props.options || props.options.length == 0) return []
- const normalized = props.options[0]?.group
+ let groups = props.options[0]?.group
? props.options
: [{ group: '', items: props.options }]
- return normalized
- .map((group, i) => ({
- key: i,
- group: group.group,
- hideLabel: group.hideLabel || false,
- items: props.filterable ? filterOptions(group.items) : group.items,
- }))
+
+ return groups
+ .map((group, i) => {
+ return {
+ key: i,
+ group: group.group,
+ hideLabel: group.hideLabel || false,
+ items: props.filterable ? filterOptions(group.items) : group.items,
+ }
+ })
.filter((group) => group.items.length > 0)
})
function filterOptions(options) {
- if (!query.value) return options
- const q = query.value.toLowerCase()
- return options.filter((option) =>
- [option.label, option.value]
- .filter(Boolean)
- .some((text) => text.toString().toLowerCase().includes(q))
- )
-}
-
-watchDebounced(
- query,
- (val) => {
- emit('update:query', val)
- },
- { debounce: 300 }
-)
-
-const onFocus = () => {
- trigger.value?.$el.click()
- nextTick(() => {
- search.value?.focus()
+ if (!query.value) {
+ return options
+ }
+ return options.filter((option) => {
+ let searchTexts = [option.label, option.value]
+ return searchTexts.some((text) =>
+ (text || '').toString().toLowerCase().includes(query.value.toLowerCase())
+ )
})
}
-const close = () => {
- selectedValue.value = null
- trigger.value?.$el.click()
+function displayValue(option) {
+ if (typeof option === 'string') {
+ let allOptions = groups.value.flatMap((group) => group.items)
+ let selectedOption = allOptions.find((o) => o.value === option)
+ return selectedOption?.label || option
+ }
+ return option?.label
}
-const textColor = computed(() =>
- props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
-)
+watch(query, (q) => {
+ emit('update:query', q)
+})
+
+watch(showOptions, (val) => {
+ if (val) {
+ nextTick(() => {
+ search.value.el.focus()
+ })
+ }
+})
+
+const textColor = computed(() => {
+ return props.disabled ? 'text-ink-gray-5' : 'text-ink-gray-8'
+})
const inputClasses = computed(() => {
- const sizeClasses = {
+ let sizeClasses = {
sm: 'text-base rounded h-7',
md: 'text-base rounded h-8',
lg: 'text-lg rounded-md h-10',
xl: 'text-xl rounded-md h-10',
}[props.size]
- const paddingClasses = {
+ let paddingClasses = {
sm: 'py-1.5 px-2',
md: 'py-1.5 px-2.5',
lg: 'py-1.5 px-3',
xl: 'py-1.5 px-3',
}[props.size]
- const variant = props.disabled ? 'disabled' : props.variant
-
- const variantClasses = {
+ let variant = props.disabled ? 'disabled' : props.variant
+ let variantClasses = {
subtle:
'border border-outline-gray-modals bg-surface-gray-2 placeholder-ink-gray-4 hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:bg-surface-white focus:border-outline-gray-4 focus:shadow-sm focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3',
outline:
@@ -246,4 +307,6 @@ const inputClasses = computed(() => {
'transition-colors w-full',
]
})
+
+defineExpose({ query })
diff --git a/frontend/src/components/Controls/Link.vue b/frontend/src/components/Controls/Link.vue
index a84cea4f..6d73dbaf 100644
--- a/frontend/src/components/Controls/Link.vue
+++ b/frontend/src/components/Controls/Link.vue
@@ -95,7 +95,8 @@ const value = computed({
get: () => (valuePropPassed.value ? attrs.value : props.modelValue),
set: (val) => {
return (
- val && emit(valuePropPassed.value ? 'change' : 'update:modelValue', val)
+ val?.value &&
+ emit(valuePropPassed.value ? 'change' : 'update:modelValue', val.value)
)
},
})
diff --git a/frontend/src/components/Controls/Uploader.vue b/frontend/src/components/Controls/Uploader.vue
index 5bcd81a2..1f6ec5ee 100644
--- a/frontend/src/components/Controls/Uploader.vue
+++ b/frontend/src/components/Controls/Uploader.vue
@@ -38,7 +38,7 @@
'border object-cover',
shape === 'circle'
? 'w-20 h-20 rounded-full'
- : 'w-44 h-auto min-h-20 rounded-md',
+ : 'w-44 h-auto min-h-20 max-h-32 rounded-md',
]"
/>
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
- {{
- option.value === option.label
- ? option.description
- : option.label
- }}
-
-
- {{ option.value }}
-
-
+
+
- {{ __('No results found') }}
+
+
+ {{ __('No results found') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ group.group }}
+
+
+
+
+ {{
+ option.value == option.label && option.description
+ ? option.description
+ : option.label
+ }}
+
+
+ {{ option.value }}
+
+
+
-
-
-
-
-
+
+ {{ review.review }}
+
- {{ review.review }}
-
-
-
-
-
-
- {{ __('Live Class') }}
-
-
-
-
-
-
-
- {{ cls.title }}
-
-
- {{ cls.description }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('No live classes scheduled') }}
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/Modals/EvaluationModal.vue b/frontend/src/components/Modals/EvaluationModal.vue
index cbc86f99..afb1916d 100644
--- a/frontend/src/components/Modals/EvaluationModal.vue
+++ b/frontend/src/components/Modals/EvaluationModal.vue
@@ -55,6 +55,9 @@
+
-
-
-
-
-
-
- {{ student.progress }}% {{ __('Complete') }}
-
-
-
- {{ student.full_name }}
-
-
- {{ student.email }}
-
-
-
-
-
-
-
-
-
- {{ assessment }}
-
-
-
- {{ student.assessments[assessment].status }}
-
-
-
- {{ student.assessments[assessment].status }}
-
-
-
-
-
-
-
- {{ __('Assessment') }}
-
-
- {{ __('Percentage/Status') }}
-
-
-
-
-
-
- {{ __('Courses') }}
-
-
- {{ __('Progress') }}
-
-
-
-
- {{ course }}
-
-
- {{ Math.floor(student.courses[course]) }}
-
-
-
+ {{ __('Please select a course to view available slots.') }}
+
{{ __('No slots available for the selected course.') }}
diff --git a/frontend/src/components/Modals/FeedbackModal.vue b/frontend/src/components/Modals/FeedbackModal.vue
index c7318e48..b69d6615 100644
--- a/frontend/src/components/Modals/FeedbackModal.vue
+++ b/frontend/src/components/Modals/FeedbackModal.vue
@@ -7,7 +7,7 @@
>
-
+
diff --git a/frontend/src/components/Modals/VideoStatistics.vue b/frontend/src/components/Modals/VideoStatistics.vue
index 9b72d96b..19929634 100644
--- a/frontend/src/components/Modals/VideoStatistics.vue
+++ b/frontend/src/components/Modals/VideoStatistics.vue
@@ -3,7 +3,7 @@
v-model="show"
:options="{
size: '4xl',
- title: __('Video Statistics for {0}').format(lessonTitle),
+ title: __('Video Statistics'),
}"
>
@@ -21,17 +21,22 @@
class="mt-2 mr-5 w-[25%]"
/> -->
-
{{ __('Training Feedback') }}
+
()
const currentTab = ref('')
@@ -171,7 +178,7 @@ watch(show, () => {
const statisticsData = computed(() => {
const grouped = >{}
- statistics.data.forEach((item: { source: string }) => {
+ statistics.data?.forEach((item: { source: string }) => {
if (!grouped[item.source]) {
grouped[item.source] = []
}
diff --git a/frontend/src/components/Settings/BadgeForm.vue b/frontend/src/components/Settings/BadgeForm.vue
index 75d2cc8b..4a3a48bd 100644
--- a/frontend/src/components/Settings/BadgeForm.vue
+++ b/frontend/src/components/Settings/BadgeForm.vue
@@ -206,7 +206,7 @@ const referenceDoctypeOptions = computed(() => {
})
const eventOptions = computed(() => {
- let options = ['New', 'Value Change', 'Auto Assign']
+ let options = ['New', 'Value Change', 'Manual Assignment']
return options.map((event) => ({ label: __(event), value: event }))
})
diff --git a/frontend/src/components/Settings/SettingDetails.vue b/frontend/src/components/Settings/SettingDetails.vue
index 2674b3bf..3c276d1c 100644
--- a/frontend/src/components/Settings/SettingDetails.vue
+++ b/frontend/src/components/Settings/SettingDetails.vue
@@ -6,16 +6,18 @@
+
{{ __('Member') }}
- {{ __('Watch Time') }}
+ {{ __('Watch Time (mins)') }}
-
@@ -101,6 +107,7 @@ import {
import { computed, ref, watch } from 'vue'
import { enablePlyr, formatTimestamp } from '@/utils'
import VideoBlock from '@/components/VideoBlock.vue'
+import NumberChartGraph from '@/components/NumberChartGraph.vue'
const show = defineModel
-
+
{{ __(label) }}
+
{{ __(description) }}
diff --git a/frontend/src/components/Settings/Settings.vue b/frontend/src/components/Settings/Settings.vue
index 1a021f1e..0365ed02 100644
--- a/frontend/src/components/Settings/Settings.vue
+++ b/frontend/src/components/Settings/Settings.vue
@@ -219,6 +219,25 @@ const tabsStructure = computed(() => {
},
],
},
+ {
+ label: 'Jobs',
+ columns: [
+ {
+ fields: [
+ {
+ label: 'Allow Job Posting',
+ name: 'allow_job_posting',
+ type: 'checkbox',
+ description:
+ 'If enabled, users can post job openings on the job board. Else only admins can post jobs.',
+ },
+ ],
+ },
+ {
+ fields: [],
+ },
+ ],
+ },
{
label: '',
columns: [
diff --git a/frontend/src/components/UpcomingEvaluations.vue b/frontend/src/components/UpcomingEvaluations.vue
index e93d31f5..5e650c8f 100644
--- a/frontend/src/components/UpcomingEvaluations.vue
+++ b/frontend/src/components/UpcomingEvaluations.vue
@@ -5,7 +5,7 @@
{{ __('Upcoming Evaluations') }}
-
+
-
-
+
{{ evl.course_title }}
+
@@ -200,7 +202,7 @@ const openEvalCall = (evl) => {
const evaluationCourses = computed(() => {
return props.courses.filter((course) => {
- return course.evaluator != ''
+ return course.evaluator && course.evaluator != ''
})
})
diff --git a/frontend/src/pages/Badge.vue b/frontend/src/pages/Badge.vue
deleted file mode 100644
index 565c6502..00000000
--- a/frontend/src/pages/Badge.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
{{ __('Schedule an evaluation to get certified.') }}
-
-
-
diff --git a/frontend/src/pages/Batch.vue b/frontend/src/pages/Batch.vue
deleted file mode 100644
index de79570e..00000000
--- a/frontend/src/pages/Batch.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-
-
- ![]()
-
-
- {{ badge.data.badge }}
-
-
- {{
- __('This badge has been awarded to {0} on {1}.').format(
- badge.data.member_name,
- dayjs(badge.data.issued_on).format('DD MMM YYYY')
- )
- }}
-
-
- {{ badge.data.badge_description }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('About this batch') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('Feedback') }}
-
-
-
-
-
-
-
- {{ __('Not Permitted') }}
-
-
-
-
-
-
-
-
- {{
- __(
- 'You are not a member of this batch. Please checkout our upcoming batches.'
- )
- }}
-
-
- {{ __('Please login to access this page.') }}
-
-
-
-
-
-
-
-
diff --git a/frontend/src/pages/BatchForm.vue b/frontend/src/pages/BatchForm.vue
deleted file mode 100644
index 6ee78ea7..00000000
--- a/frontend/src/pages/BatchForm.vue
+++ /dev/null
@@ -1,592 +0,0 @@
-
-
-
-
-
-
-
-
- {{ batch.data.title }}
-
-
- {{ batch.data.description }}
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('Courses') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/pages/Batches/BatchDetail.vue b/frontend/src/pages/Batches/BatchDetail.vue
new file mode 100644
index 00000000..a3a83f18
--- /dev/null
+++ b/frontend/src/pages/Batches/BatchDetail.vue
@@ -0,0 +1,267 @@
+
+
-
-
-
-
-
-
-
-
-
- {{ __('Details') }}
-
-
-
-
-
-
-
-
-
- {{ __('Settings') }}
-
-
-
-
-
-
-
- {{ __('Date and Time') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('Configurations') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ __('Pricing') }}
-
-
-
-
-
-
- {{ __('Meta Tags') }}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ __('Not Saved') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/Batches/BatchOverview.vue b/frontend/src/pages/Batches/BatchOverview.vue
new file mode 100644
index 00000000..918ffe7a
--- /dev/null
+++ b/frontend/src/pages/Batches/BatchOverview.vue
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+ {{ __('Details') }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __('Certification') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __('Pricing') }}
+
+
+
+
+
+
+ {{ __('Meta Tags') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/pages/Batches.vue b/frontend/src/pages/Batches/Batches.vue
similarity index 94%
rename from frontend/src/pages/Batches.vue
rename to frontend/src/pages/Batches/Batches.vue
index 43cc71de..63e29ef4 100644
--- a/frontend/src/pages/Batches.vue
+++ b/frontend/src/pages/Batches/Batches.vue
@@ -10,10 +10,7 @@
label: __('New Batch'),
icon: 'users',
onClick() {
- router.push({
- name: 'BatchForm',
- params: { batchName: 'new' },
- })
+ showBatchModal = true
},
},
{
@@ -45,20 +42,6 @@
-
+
+
+
+
+ {{ batch.data.title }}
+
+
+ {{ batch.data.description }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ __('Courses') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/components/Assessments.vue b/frontend/src/pages/Batches/components/Assessments.vue
similarity index 90%
rename from frontend/src/components/Assessments.vue
rename to frontend/src/pages/Batches/components/Assessments.vue
index f8b71c76..7e2c7200 100644
--- a/frontend/src/components/Assessments.vue
+++ b/frontend/src/pages/Batches/components/Assessments.vue
@@ -1,7 +1,7 @@
+ {{ __('Announcements') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ comm.sender_full_name }}
+
+
+ {{ timeAgo(comm.communication_date) }}
+
+
+ {{ __('No announcements have been made yet for this batch') }}
+
+
-
+
{{ __('Assessments') }}