Merge pull request #1593 from pateljannat/programming-exercises

feat: programming exercises
This commit is contained in:
Jannat Patel
2025-06-26 13:05:22 +05:30
committed by GitHub
55 changed files with 2728 additions and 70 deletions

View File

@@ -313,7 +313,7 @@ const addNotifications = () => {
const addQuizzes = () => {
if (isInstructor.value || isModerator.value) {
sidebarLinks.value.push({
sidebarLinks.value.splice(4, 0, {
label: 'Quizzes',
icon: 'CircleHelp',
to: 'Quizzes',
@@ -329,7 +329,7 @@ const addQuizzes = () => {
const addAssignments = () => {
if (isInstructor.value || isModerator.value) {
sidebarLinks.value.push({
sidebarLinks.value.splice(5, 0, {
label: 'Assignments',
icon: 'Pencil',
to: 'Assignments',

View File

@@ -2,17 +2,24 @@
<Dialog
v-model="show"
:options="{
title:
type == 'quiz'
? __('Add a quiz to your lesson')
: __('Add an assignment to your lesson'),
size: 'xl',
actions: [
{
label: __('Save'),
variant: 'solid',
onClick: () => {
addAssessment()
},
},
],
}"
>
<template #body>
<div class="p-5 space-y-4">
<div v-if="type == 'quiz'" class="text-lg font-semibold">
{{ __('Add a quiz to your lesson') }}
</div>
<div v-else class="text-lg font-semibold">
{{ __('Add an assignment to your lesson') }}
</div>
<template #body-content>
<div class="">
<div>
<Link
v-if="type == 'quiz'"
@@ -29,17 +36,12 @@
:onCreate="(value, close) => redirectToForm()"
/>
</div>
<div class="flex justify-end space-x-2">
<Button variant="solid" @click="addAssessment()">
{{ __('Save') }}
</Button>
</div>
</div>
</template>
</Dialog>
</template>
<script setup>
import { Dialog, Button } from 'frappe-ui'
import { Dialog } from 'frappe-ui'
import { onMounted, ref, nextTick } from 'vue'
import Link from '@/components/Controls/Link.vue'

View File

@@ -40,7 +40,7 @@
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<div v-if="column.key == 'assessment_type'">
{{ row[column.key] == 'LMS Quiz' ? 'Quiz' : 'Assignment' }}
{{ getAssessmentTypeLabel(row[column.key]) }}
</div>
<div v-else-if="column.key == 'title'">
{{ row[column.key] }}
@@ -172,6 +172,24 @@ const getRowRoute = (row) => {
},
}
}
} else if (row.assessment_type == 'LMS Programming Exercise') {
if (row.submission) {
return {
name: 'ProgrammingExerciseSubmission',
params: {
exerciseID: row.assessment_name,
submissionID: row.submission.name,
},
}
} else {
return {
name: 'ProgrammingExerciseSubmission',
params: {
exerciseID: row.assessment_name,
submissionID: 'new',
},
}
}
} else {
return {
name: 'QuizPage',
@@ -213,7 +231,7 @@ const getAssessmentColumns = () => {
}
const getStatusTheme = (status) => {
if (status === 'Pass') {
if (status === 'Pass' || status === 'Passed') {
return 'green'
} else if (status === 'Not Graded') {
return 'orange'
@@ -221,4 +239,14 @@ const getStatusTheme = (status) => {
return 'red'
}
}
const getAssessmentTypeLabel = (type) => {
if (type == 'LMS Assignment') {
return __('Assignment')
} else if (type == 'LMS Quiz') {
return __('Quiz')
} else if (type == 'LMS Programming Exercise') {
return __('Programming Exercise')
}
}
</script>

View File

@@ -6,13 +6,12 @@
:courses="batch.data.courses"
/>
<Assessments :batch="batch.data.name" />
<StudentHeatmap />
<!-- <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: {

View File

@@ -8,6 +8,7 @@
class="flex w-full items-center justify-between focus:outline-none"
:class="inputClasses"
@click="() => togglePopover()"
:disabled="attrs.readonly"
>
<div class="flex items-center">
<slot name="prefix" />

View File

@@ -0,0 +1,149 @@
<template>
<div>
<div class="text-xs text-ink-gray-5 mb-2">
{{ label }}
</div>
<div class="overflow-x-auto border rounded-md">
<div
class="grid items-center space-x-4 p-2 border-b"
:style="{ gridTemplateColumns: getGridTemplateColumns() }"
>
<div
v-for="(column, index) in columns"
:key="index"
class="text-sm text-ink-gray-5"
>
{{ column }}
</div>
<div></div>
</div>
<div
v-for="(row, rowIndex) in rows"
:key="rowIndex"
class="grid items-center space-x-4 p-2"
:style="{ gridTemplateColumns: getGridTemplateColumns() }"
>
<template v-for="key in Object.keys(row)" :key="key">
<input
v-if="showKey(key)"
v-model="row[key]"
class="py-1.5 px-2 border-none focus:ring-0 focus:border focus:border-gray-300 focus:bg-surface-gray-2 rounded-sm text-sm focus:outline-none"
/>
</template>
<div class="relative" ref="menuRef">
<Button
variant="ghost"
@click="(event: MouseEvent) => toggleMenu(rowIndex, event)"
>
<template #icon>
<Ellipsis
class="size-4 text-ink-gray-7 stroke-1.5 cursor-pointer"
/>
</template>
</Button>
<div
v-if="menuOpenIndex === rowIndex"
class="absolute right-[30px] top-5 mt-1 w-32 bg-surface-white border border-outline-gray-1 rounded-md shadow-sm"
>
<button
@click="deleteRow(rowIndex)"
class="flex items-center space-x-2 w-full text-left px-3 py-2 text-sm text-ink-red-3"
>
<Trash2 class="size-4 stroke-1.5" />
<span>
{{ __('Delete') }}
</span>
</button>
</div>
</div>
</div>
</div>
<div class="mt-2">
<Button @click="addRow">
<template #prefix>
<Plus class="size-4 text-ink-gray-7" />
</template>
{{ __('Add Row') }}
</Button>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, watch } from 'vue'
import { Button } from 'frappe-ui'
import { Ellipsis, Plus, Trash2 } from 'lucide-vue-next'
import { onClickOutside } from '@vueuse/core'
const rows = defineModel<Cell[][]>()
const menuRef = ref(null)
const menuOpenIndex = ref<number | null>(null)
const menuTopPosition = ref<string>('')
const emit = defineEmits<{
(e: 'update:modelValue', value: Cell[][]): void
}>()
type Cell = {
value: string
editable?: boolean
}
const props = withDefaults(
defineProps<{
modelValue?: Cell[][]
columns?: string[]
label?: string
}>(),
{
columns: [],
}
)
const columns = ref(props.columns)
watch(rows, () => {
if (rows.value?.length < 1) {
addRow()
}
})
const addRow = () => {
if (!rows.value) {
rows.value = []
}
let newRow: { [key: string]: string } = {}
columns.value.forEach((column: any) => {
newRow[column.toLowerCase().split(' ').join('_')] = ''
})
rows.value.push(newRow)
emit('update:modelValue', rows.value)
}
const deleteRow = (index: number) => {
rows.value.splice(index, 1)
emit('update:modelValue', rows.value)
}
const getGridTemplateColumns = () => {
return [...Array(columns.value.length).fill('1fr'), '0.25fr'].join(' ')
}
const toggleMenu = (index: number, event: MouseEvent) => {
menuOpenIndex.value = menuOpenIndex.value === index ? null : index
menuTopPosition.value = `${event.clientY + 10}px`
}
onClickOutside(menuRef, () => {
menuOpenIndex.value = null
})
const showKey = (key: string) => {
let columnsLower = columns.value.map((col) =>
col.toLowerCase().split(' ').join('_')
)
return columnsLower.includes(key)
}
</script>

View File

@@ -0,0 +1,155 @@
<template>
<div class="flex w-full flex-col gap-1.5">
<codemirror
v-model="code"
:extensions="extensions"
:tab-size="2"
:autofocus="autofocus"
:indent-with-tab="true"
:style="{ height: height, maxHeight: maxHeight }"
:disabled="readonly"
@blur="emitEditorValue"
/>
<Button
v-if="showSaveButton"
@click="emit('save', code)"
class="mt-3 w-full text-base"
>
{{ __('Save') }}
</Button>
</div>
</template>
<script setup lang="ts">
import { onMounted, ref, computed, watch } from 'vue'
import { Button } from 'frappe-ui'
import { Codemirror } from 'vue-codemirror'
import { autocompletion, closeBrackets } from '@codemirror/autocomplete'
import { LanguageSupport } from '@codemirror/language'
import { EditorView } from '@codemirror/view'
import { tomorrow } from 'thememirror'
const props = withDefaults(
defineProps<{
language: 'json' | 'javascript' | 'html' | 'css' | 'python'
modelValue: string | object | Array<string | object> | null
height?: string
maxHeight?: string
autofocus?: boolean
showSaveButton?: boolean
showLineNumbers?: boolean
completions?: Function | null
label?: string
required?: boolean
readonly?: boolean
}>(),
{
language: 'javascript',
modelValue: null,
height: 'auto',
maxHeight: '250px',
showLineNumbers: true,
completions: null,
}
)
const emit = defineEmits(['update:modelValue', 'save'])
const code = ref<string>('')
watch(
() => props.modelValue,
(newVal) => {
code.value =
typeof newVal === 'string' ? newVal : JSON.stringify(newVal, null, 2)
},
{ immediate: true }
)
watch(code, (val) => {
emit('update:modelValue', val)
})
const errorMessage = ref('')
const emitEditorValue = () => {
try {
errorMessage.value = ''
let value = code.value || ''
if (!props.showSaveButton && !props.readonly) {
emit('update:modelValue', value)
}
} catch (e) {
console.error('Error while parsing JSON for editor', e)
errorMessage.value = `Invalid object/JSON: ${e.message}`
}
}
const languageExtension = ref<LanguageSupport>()
const autocompleteExtension = ref()
async function setLanguageExtension() {
const importMap = {
json: () => import('@codemirror/lang-json'),
javascript: () => import('@codemirror/lang-javascript'),
html: () => import('@codemirror/lang-html'),
css: () => import('@codemirror/lang-css'),
python: () => import('@codemirror/lang-python'),
}
const languageImport = importMap[props.language]
if (!languageImport) return
const module = await languageImport()
languageExtension.value = (module as any)[props.language]()
if (props.completions) {
const languageData = (module as any)[`${props.language}Language`]
autocompleteExtension.value = languageData.data.of({
autocomplete: props.completions,
})
}
}
onMounted(async () => {
await setLanguageExtension()
})
watch(
() => props.language,
async () => {
await setLanguageExtension()
},
{ immediate: true }
)
const extensions = computed(() => {
const baseExtensions = [
closeBrackets(),
tomorrow,
EditorView.theme({
'&': {
fontFamily: 'monospace',
fontSize: '12px',
},
'.cm-gutters': {
display: props.showLineNumbers ? 'flex' : 'none',
},
}),
]
if (languageExtension.value) {
baseExtensions.push(languageExtension.value)
}
if (autocompleteExtension.value) {
baseExtensions.push(autocompleteExtension.value)
}
const autocompletionOptions = {
activateOnTyping: true,
maxRenderedOptions: 10,
closeOnBlur: false,
icons: false,
optionClass: () => 'flex h-7 !px-2 items-center rounded !text-gray-600',
}
baseExtensions.push(autocompletion(autocompletionOptions))
return baseExtensions
})
</script>

View File

@@ -12,6 +12,7 @@
:variant="attrs.variant"
:placeholder="attrs.placeholder"
:filterable="false"
:readonly="attrs.readonly"
>
<template #target="{ open, togglePopover }">
<slot name="target" v-bind="{ open, togglePopover }" />

View File

@@ -99,6 +99,7 @@ const assessmentTypes = computed(() => {
return [
{ label: 'Quiz', value: 'LMS Quiz' },
{ label: 'Assignment', value: 'LMS Assignment' },
{ label: 'Programming Exercise', value: 'LMS Programming Exercise' },
]
})
</script>

View File

@@ -255,6 +255,9 @@ const saveEvaluation = () => {
}
toast.success(__('Evaluation saved successfully'))
},
onError(err) {
toast.warning(__(err.messages?.[0] || err))
},
}
)
}
@@ -277,6 +280,9 @@ const certificateResource = createResource({
onSuccess(data) {
certificate.name = data
},
onError(err) {
toast.warning(__(err.messages?.[0] || err))
},
})
const certificateDetails = createResource({
@@ -310,6 +316,9 @@ const saveCertificate = () => {
onSuccess: () => {
toast.success(__('Certificate saved successfully'))
},
onError(err) {
toast.error(__(err.messages?.[0] || err))
},
}
)
}

View File

@@ -166,6 +166,12 @@ const tabsStructure = computed(() => {
doctype: 'Email Template',
type: 'Link',
},
{
label: 'Livecode URL',
name: 'livecode_url',
doctype: 'Livecode URL',
type: 'text',
},
{
label: 'Unsplash Access Key',
name: 'unsplash_access_key',

11
frontend/src/global.d.ts vendored Normal file
View File

@@ -0,0 +1,11 @@
export {}
declare global {
function __(text: string): string
}
declare module 'vue' {
interface ComponentCustomProperties {
__: (text: string) => string
}
}

View File

@@ -1,2 +1,3 @@
@import './assets/Inter/inter.css';
@import 'frappe-ui/src/style.css';
@import './styles/codemirror.css';

View File

@@ -22,14 +22,11 @@
<div class="md:w-3/4 md:mx-auto py-5 mx-5">
<div class="flex items-center justify-between mb-5">
<div
v-if="assignmentCount"
class="text-xl font-semibold text-ink-gray-7 mb-4"
>
<div v-if="assignmentCount" class="text-lg font-semibold text-ink-gray-9">
{{ __('{0} Assignments').format(assignmentCount) }}
</div>
<div
v-if="assignments.data?.length || assigmentCount > 0"
v-if="assignments.data?.length || assignmentCount > 0"
class="grid grid-cols-2 gap-5"
>
<FormControl

View File

@@ -57,7 +57,7 @@
</div>
<div
v-if="courses.data?.length"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-4"
class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-5"
>
<router-link
v-for="course in courses.data"

View File

@@ -65,7 +65,7 @@
<div
class="border-r container pt-5 pb-10 px-5 h-full"
:class="{
'w-full md:w-3/4 mx-auto border-none !pt-10': zenModeEnabled,
'w-full md:w-3/5 mx-auto border-none !pt-10': zenModeEnabled,
}"
>
<div
@@ -296,6 +296,7 @@ import {
import Discussions from '@/components/Discussions.vue'
import { getEditorTools, enablePlyr } from '@/utils'
import { sessionStore } from '@/stores/session'
import { useSidebar } from '@/stores/sidebar'
import EditorJS from '@editorjs/editorjs'
import LessonContent from '@/components/LessonContent.vue'
import CourseInstructors from '@/components/CourseInstructors.vue'
@@ -316,6 +317,7 @@ const hasQuiz = ref(false)
const discussionsContainer = ref(null)
const timer = ref(0)
const { brand } = sessionStore()
const sidebarStore = useSidebar()
let timerInterval
const props = defineProps({
@@ -335,6 +337,8 @@ const props = defineProps({
onMounted(() => {
startTimer()
console.log(sidebarStore.isSidebarCollapsed)
sidebarStore.isSidebarCollapsed = true
document.addEventListener('fullscreenchange', attachFullscreenEvent)
socket.on('update_lesson_progress', (data) => {
if (data.course === props.courseName) {
@@ -357,6 +361,7 @@ const attachFullscreenEvent = () => {
onBeforeUnmount(() => {
document.removeEventListener('fullscreenchange', attachFullscreenEvent)
sidebarStore.isSidebarCollapsed = false
})
const lesson = createResource({
@@ -554,7 +559,7 @@ const canGoZen = () => {
user.data?.is_instructor ||
user.data?.is_evaluator
)
return false
return true
if (lesson.data?.membership) return true
return false
}

View File

@@ -210,7 +210,7 @@ const addInstructorNotes = (data) => {
const enableAutoSave = () => {
autoSaveInterval = setInterval(() => {
saveLesson({ showSuccessMessage: false })
}, 5000)
}, 10000)
}
const keyboardShortcut = (e) => {
@@ -385,8 +385,10 @@ const saveLesson = (e) => {
showSuccessMessage = true
}
editor.value.save().then((outputData) => {
outputData = removeEmptyBlocks(outputData)
lesson.content = JSON.stringify(outputData)
instructorEditor.value.save().then((outputData) => {
outputData = removeEmptyBlocks(outputData)
lesson.instructor_content = JSON.stringify(outputData)
if (lessonDetails.data?.lesson) {
editCurrentLesson()
@@ -397,6 +399,14 @@ const saveLesson = (e) => {
})
}
const removeEmptyBlocks = (outputData) => {
let blocks = outputData.blocks.filter((block) => {
return Object.keys(block.data).length > 0 || block.type == 'paragraph'
})
outputData.blocks = blocks
return outputData
}
const createNewLesson = () => {
newLessonResource.submit(
{},
@@ -686,7 +696,7 @@ iframe {
}
.ce-popover--opened > .ce-popover__container {
max-height: 320px;
max-height: unset;
}
.cdx-search-field__icon svg {

View File

@@ -0,0 +1,255 @@
<template>
<Dialog v-model="show" :options="{ size: '5xl' }">
<template #body-title>
<div class="text-xl font-semibold text-ink-gray-9">
{{
props.exerciseID === 'new'
? __('Create Programming Exercise')
: __('Edit Programming Exercise')
}}
</div>
</template>
<template #body-content>
<div class="grid grid-cols-2 gap-10">
<div class="space-y-4">
<FormControl
v-model="exercise.title"
:label="__('Title')"
:required="true"
/>
<FormControl
v-model="exercise.language"
:label="__('Language')"
type="select"
:options="languageOptions"
:required="true"
/>
<ChildTable
v-model="exercise.test_cases"
:label="__('Test Cases')"
:columns="testCaseColumns"
:required="true"
:addable="true"
:deletable="true"
:editable="true"
:placeholder="__('Add Test Case')"
/>
</div>
<div>
<div>
<div class="text-xs text-ink-gray-5 mb-2">
{{ __('Problem Statement') }}
<span class="text-ink-red-3">*</span>
</div>
<TextEditor
:content="exercise.problem_statement"
@change="(val: string) => (exercise.problem_statement = val)"
:editable="true"
:fixedMenu="true"
editorClass="prose-sm max-w-none border-b border-x bg-surface-gray-2 rounded-b-md py-1 px-2 min-h-[7rem] max-h-[21rem] overflow-y-auto"
/>
</div>
</div>
</div>
</template>
<template #actions="{ close }">
<div class="flex justify-end space-x-2 group">
<Button
v-if="exerciseID != 'new'"
@click="deleteExercise(close)"
variant="outline"
theme="red"
class="invisible group-hover:visible"
>
<template #prefix>
<Trash2 class="size-4 stroke-1.5" />
</template>
{{ __('Delete') }}
</Button>
<router-link
:to="{
name: 'ProgrammingExerciseSubmission',
params: {
exerciseID: props.exerciseID,
submissionID: 'new',
},
}"
>
<Button>
<template #prefix>
<Play class="size-4 stroke-1.5" />
</template>
{{ __('Test this Exercise') }}
</Button>
</router-link>
<router-link
:to="{
name: 'ProgrammingExerciseSubmissions',
query: {
exercise: props.exerciseID,
},
}"
>
<Button>
<template #prefix>
<ClipboardList class="size-4 stroke-1.5" />
</template>
{{ __('Check Submission') }}
</Button>
</router-link>
<Button variant="solid" @click="saveExercise(close)">
{{ __('Save') }}
</Button>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
import {
Button,
createListResource,
Dialog,
FormControl,
TextEditor,
toast,
} from 'frappe-ui'
import { computed, ref, watch } from 'vue'
import {
ProgrammingExercise,
ProgrammingExercises,
TestCase,
} from '@/types/programming-exercise'
import ChildTable from '@/components/Controls/ChildTable.vue'
import { ClipboardList, Play, Trash2 } from 'lucide-vue-next'
const show = defineModel()
const exercises = defineModel<ProgrammingExercises>('exercises')
const exercise = ref<ProgrammingExercise>({
title: '',
language: 'Python',
problem_statement: '',
test_cases: [],
})
const languageOptions = [
{ label: 'Python', value: 'Python' },
{ label: 'JavaScript', value: 'JavaScript' },
]
const props = withDefaults(
defineProps<{
exerciseID: string
}>(),
{
exerciseID: 'new',
}
)
watch(
() => props.exerciseID,
() => {
setExerciseData()
fetchTestCases()
}
)
const setExerciseData = () => {
let isNew = true
exercises.value?.data.forEach((ex: ProgrammingExercise) => {
if (ex.name === props.exerciseID) {
isNew = false
exercise.value = { ...ex }
}
})
if (isNew) {
exercise.value = {
title: '',
language: 'Python',
problem_statement: '',
test_cases: [],
}
}
}
const testCases = createListResource({
doctype: 'LMS Test Case',
fields: ['input', 'expected_output', 'name'],
cache: ['testCases', props.exerciseID],
parent: 'LMS Programming Exercise',
onSuccess(data: TestCase[]) {
exercise.value.test_cases = data
},
})
const fetchTestCases = () => {
testCases.update({
filters: {
parent: props.exerciseID,
parenttype: 'LMS Programming Exercise',
parentfield: 'test_cases',
},
})
testCases.reload()
}
const saveExercise = (close: () => void) => {
if (props.exerciseID == 'new') createNewExercise(close)
else updateExercise(close)
}
const createNewExercise = (close: () => void) => {
exercises.value?.insert.submit(
{
...exercise.value,
},
{
onSuccess() {
close()
exercises.value?.reload()
toast.success(__('Programming Exercise created successfully'))
},
onError(err: any) {
toast.warning(__(err.messages?.[0] || err))
},
}
)
}
const updateExercise = (close: () => void) => {
exercises.value?.setValue.submit(
{
name: props.exerciseID,
...exercise.value,
},
{
onSuccess() {
close()
exercises.value?.reload()
toast.success(__('Programming Exercise updated successfully'))
},
onError(err: any) {
toast.warning(__(err.messages?.[0] || err))
},
}
)
}
const testCaseColumns = computed(() => {
return ['Input', 'Expected Output']
})
const deleteExercise = (close: () => void) => {
if (props.exerciseID == 'new') return
exercises.value?.delete.submit(props.exerciseID, {
onSuccess() {
toast.success(__('Programming Exercise deleted successfully'))
close()
},
onError(err: any) {
toast.warning(__(err.messages?.[0] || err))
},
})
}
</script>

View File

@@ -0,0 +1,53 @@
<template>
<Dialog
v-model="show"
:options="{
title: __('Add a programming exercise to your lesson'),
size: 'xl',
actions: [
{
label: __('Save'),
variant: 'solid',
onClick: () => {
saveExercise()
},
},
],
}"
>
<template #body-content>
<div class="text-base">
<Link
v-model="exercise"
doctype="LMS Programming Exercise"
:label="__('Select a Programming Exercise')"
/>
</div>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { Dialog } from 'frappe-ui'
import { onMounted, nextTick, ref } from 'vue'
import Link from '@/components/Controls/Link.vue'
const show = ref(false)
const exercise = ref(null)
const props = defineProps({
onSave: {
type: Function,
required: true,
},
})
onMounted(async () => {
await nextTick()
show.value = true
})
const saveExercise = () => {
props.onSave(exercise.value)
show.value = false
}
</script>

View File

@@ -0,0 +1,439 @@
<template>
<header
v-if="!fromLesson"
class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
</header>
<div
v-if="falconError"
class="flex items-center justify-between p-3 text-sm bg-surface-amber-1 text-ink-amber-3"
>
<span>
{{ falconError }}
</span>
<Button v-if="user.data?.is_moderator" @click="openSettings('General')">
<template #prefix>
<Settings class="size-4 stroke-1.5" />
</template>
{{ __('Settings') }}
</Button>
</div>
<div class="grid grid-cols-2 h-[calc(100vh_-_3rem)]">
<div class="border-r py-5 px-8 h-full">
<div class="font-semibold mb-2">
{{ __('Problem Statement') }}
</div>
<div
v-html="exercise.doc?.problem_statement"
class="ProseMirror prose prose-table:table-fixed prose-td:p-2 prose-th:p-2 prose-td:border prose-th:border prose-td:border-outline-gray-2 prose-th:border-outline-gray-2 prose-td:relative prose-th:relative prose-th:bg-surface-gray-2 prose-sm max-w-none !whitespace-normal"
></div>
</div>
<div>
<div class="flex items-center justify-between p-2 bg-surface-gray-2">
<div class="font-semibold">
{{ exercise.doc?.language }}
</div>
<div class="space-x-2">
<Badge
v-if="submission.doc?.status"
:theme="submission.doc.status == 'Passed' ? 'green' : 'red'"
>
{{ submission.doc.status }}
</Badge>
<Button
v-if="
!falconError &&
(submissionID == 'new' ||
user.data?.name == submission.doc?.owner)
"
variant="solid"
@click="submitCode"
>
<template #prefix>
<Play class="size-3" />
</template>
{{ __('Run') }}
</Button>
</div>
</div>
<div class="flex flex-col space-y-4 py-5 border-b">
<Code
v-model="code"
:language="exercise.doc?.language.toLowerCase()"
height="400px"
maxHeight="1000px"
/>
<span v-if="error" class="text-xs text-ink-gray-5 px-2">
{{ __('Compiler Message') }}:
</span>
<textarea
v-if="error"
v-model="errorMessage"
class="bg-surface-gray-1 border-none text-sm h-32 leading-6"
readonly
/>
<!-- <textarea v-else v-model="output" class="bg-surface-gray-1 border-none text-sm h-28 leading-6" readonly /> -->
</div>
<div ref="testCaseSection" class="p-5">
<span class="text-lg font-semibold text-ink-gray-9">
{{ __('Test Cases') }}
</span>
<div v-if="testCases.length" class="divide-y mt-5">
<div
v-for="(testCase, index) in testCases"
:key="testCase.input"
class="py-3"
>
<div class="flex items-center mb-3">
<span class=""> {{ __('Test {0}').format(index + 1) }} - </span>
<span
class="font-semibold ml-2 mr-1"
:class="
testCase.status === 'Passed'
? 'text-ink-green-3'
: 'text-ink-red-3'
"
>
{{ testCase.status }}
</span>
<!-- <span v-if="testCase.status === 'Passed'">
<Check class="size-4 text-ink-green-3" />
</span>
<span v-else>
<X class="size-4 text-ink-red-3" />
</span> -->
</div>
<div class="flex items-center justify-between w-[60%]">
<div v-if="testCase.input" class="space-y-2">
<div class="text-xs text-ink-gray-7">
{{ __('Input') }}
</div>
<div>{{ testCase.input }}</div>
</div>
<div class="space-y-2">
<div class="text-xs text-ink-gray-7">
{{ __('Your Output') }}
</div>
<div>
{{ testCase.output }}
</div>
</div>
<div class="space-y-2">
<div class="text-xs text-ink-gray-7">
{{ __('Expected Output') }}
</div>
<div>{{ testCase.expected_output }}</div>
</div>
</div>
</div>
</div>
<div v-else class="text-sm text-ink-gray-6 mt-4">
{{ __('Please run the code to execute the test cases.') }}
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import {
Badge,
Breadcrumbs,
Button,
call,
createDocumentResource,
toast,
usePageMeta,
} from 'frappe-ui'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { Play, X, Check, Settings } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
import { openSettings } from '@/utils'
const user = inject<any>('$user')
const code = ref<string | null>('')
const output = ref<string | null>(null)
const error = ref<boolean | null>(null)
const errorMessage = ref<string | null>(null)
const testCaseSection = ref<HTMLElement | null>(null)
const testCases = ref<TestCase[]>([])
const boilerplate = ref<string>('')
const { brand, livecodeURL } = sessionStore()
const router = useRouter()
const fromLesson = ref(false)
const falconURL = ref<string>('https://falcon.frappe.io/')
const falconError = ref<string | null>(null)
const props = withDefaults(
defineProps<{
exerciseID: string
submissionID?: string
}>(),
{
submissionID: 'new',
}
)
onMounted(() => {
loadFalcon()
checkIfUserIsPermitted()
checkIfInLesson()
fetchSubmission()
})
const checkIfInLesson = () => {
if (new URLSearchParams(window.location.search).get('fromLesson')) {
fromLesson.value = true
}
}
const fetchSubmission = (name: string = '') => {
if (name) {
submission.name = name
submission.reload()
} else if (props.submissionID != 'new') {
submission.reload()
}
}
const exercise = createDocumentResource({
doctype: 'LMS Programming Exercise',
name: props.exerciseID,
cache: ['programmingExercise', props.exerciseID],
auto: true,
})
const submission = createDocumentResource({
doctype: 'LMS Programming Exercise Submission',
name: props.submissionID,
auto: false,
onError(error: any) {
if (error.messages?.[0].includes('not found')) {
router.push({
name: 'ProgrammingExerciseSubmission',
params: { exerciseID: props.exerciseID, submissionID: 'new' },
})
} else {
toast.error(__(error.messages?.[0] || error))
}
},
})
watch(exercise, () => {
updateCode()
})
const updateCode = (submissionCode = '') => {
updateBoilerPlate()
if (!code.value?.includes(boilerplate.value)) {
code.value = `${boilerplate.value}${code.value}`
}
if (submissionCode && !code.value?.includes(submissionCode)) {
code.value = `${code.value}${submissionCode}`
} else if (!submissionCode && !code.value) {
code.value = boilerplate.value
}
}
const updateBoilerPlate = () => {
if (exercise.doc?.language == 'Python') {
boilerplate.value = `with open("stdin", "r") as f:\n data = f.read()\n\ninputs = data.split() if len(data) else []\n\n# inputs is a list of strings\n# write your code below\n\n`
} else if (exercise.doc?.language == 'JavaScript') {
boilerplate.value = `const fs = require('fs');\n\nlet input = fs.readFileSync('/app/stdin', 'utf8').trim();\nconst inputs = input.split("\\n");\n// inputs is an array of strings\n// write your code below\n`
}
}
const checkIfUserIsPermitted = (doc: any = null) => {
if (!user.data) {
window.location.href = `/login?redirect-to=/lms/programming-exercises/${props.exerciseID}/submission/${props.submissionID}`
}
if (!doc) return
if (
doc.owner != user.data?.name &&
!user.data?.is_instructor &&
!user.data?.is_moderator &&
!user.data.is_evaluator
) {
router.push({
name: 'ProgrammingExerciseSubmission',
params: { exerciseID: props.exerciseID, submissionID: 'new' },
})
return
}
}
const updateTestCases = (doc: any) => {
if (testCases.value.length === 0) {
testCases.value = doc.test_cases || []
}
}
watch(
() => submission.doc,
(doc) => {
if (doc) {
checkIfUserIsPermitted(doc)
updateTestCases(doc)
updateCode(doc.code)
}
},
{ immediate: true }
)
const loadFalcon = () => {
if (livecodeURL.data.includes('falcon.frappe.io') && !user.data?.is_fc_site) {
falconError.value = __(
'Only Frappe Cloud sites can use Falcon Live Code. Please migrate your site to Frappe Cloud or setup Falcon Live Code on your own server.'
)
return
} else if (livecodeURL.data) {
falconURL.value = livecodeURL.data
} else if (!livecodeURL.data && !user.data?.is_fc_site) {
falconError.value = __(
'Live Code URL is not set. Please set it from the Settings.'
)
return
}
return new Promise((resolve, reject) => {
const script = document.createElement('script')
script.src = `${falconURL.value}static/livecode.js`
script.onload = resolve
script.onerror = reject
document.head.appendChild(script)
})
}
const submitCode = async () => {
await runCode()
createSubmission()
}
const runCode = async () => {
if (!exercise.doc?.test_cases?.length) return
testCases.value = []
if (testCaseSection.value) {
testCaseSection.value.scrollIntoView({ behavior: 'smooth' })
}
for (const test_case of exercise.doc.test_cases) {
let result = await execute(test_case.input)
if (error.value) {
errorMessage.value = result
break
} else {
output.value = result
}
let status =
result.trim() === test_case.expected_output.trim() ? 'Passed' : 'Failed'
testCases.value.push({
input: test_case.input,
output: result,
expected_output: test_case.expected_output,
status: status,
})
}
}
const createSubmission = () => {
if (!testCases.value.length) return
let codeToSave = code.value?.replace(boilerplate.value, '') || ''
call('lms.lms.api.create_programming_exercise_submission', {
exercise: props.exerciseID,
submission: props.submissionID,
code: codeToSave,
test_cases: testCases.value,
})
.then((data: any) => {
if (props.submissionID == 'new') {
router.push({
name: 'ProgrammingExerciseSubmission',
params: { exerciseID: props.exerciseID, submissionID: data },
})
fetchSubmission(data)
} else {
fetchSubmission(props.submissionID)
}
toast.success(__('Submission saved!'))
})
.catch((error: any) => {
console.error('Error creating submission:', error)
toast.error(
__('Failed to submit. Please try again. {0}').format({ error })
)
})
}
const execute = (stdin = ''): Promise<string> => {
return new Promise((resolve, reject) => {
let outputChunks: string[] = []
let hasExited = false
let hasError = false
let session = new LiveCodeSession({
base_url: falconURL.value,
runtime: exercise.doc?.language.toLowerCase() || 'python',
code: code.value,
files: [{ filename: 'stdin', contents: stdin }],
onMessage: (msg: any) => {
console.log('msg', msg)
if (msg.msgtype === 'write' && msg.file === 'stdout') {
outputChunks.push(msg.data)
}
if (msg.msgtype === 'write' && msg.file === 'stderr') {
hasError = true
errorMessage.value = msg.data
}
if (msg.msgtype === 'exitstatus') {
hasExited = true
if (msg.exitstatus !== 0) {
error.value = true
} else {
error.value = false
}
resolve(outputChunks.join('').trim())
}
},
})
setTimeout(() => {
if (!hasExited) {
error.value = true
errorMessage.value = 'Execution timed out.'
reject('Execution timed out.')
}
}, 20000)
})
}
const breadcrumbs = computed(() => {
return [
{
label: __('Programming Exercise Submissions'),
route: { name: 'ProgrammingExerciseSubmissions' },
},
{ label: exercise.doc?.title },
]
})
usePageMeta(() => {
return {
title: __('Programming Exercise Submission'),
icon: brand.favicon,
}
})
</script>
<style>
.ProseMirror pre {
background: theme('colors.gray.200');
color: theme('colors.gray.900');
}
</style>

View File

@@ -0,0 +1,306 @@
<template>
<header
class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
</header>
<div class="p-6">
<div class="flex items-center justify-between space-x-32 mb-5">
<div class="text-xl font-semibold text-ink-gray-7">
{{
submissions.data?.length
? __('{0} Submissions').format(submissions.data.length)
: __('No Submissions')
}}
</div>
<div
v-if="submissions.data?.length"
class="grid grid-cols-3 gap-5 flex-1"
>
<Link
doctype="LMS Programming Exercise"
v-model="filters.exercise"
:placeholder="__('Filter by Exercise')"
/>
<Link
doctype="User"
v-model="filters.member"
:placeholder="__('Filter by Member')"
:readonly="isStudent"
/>
<FormControl
v-model="filters.status"
type="select"
:options="[
{ label: __(''), value: '' },
{ label: __('Passed'), value: 'Passed' },
{ label: __('Failed'), value: 'Failed' },
]"
:placeholder="__('Filter by Status')"
/>
</div>
</div>
<ListView
v-if="submissions.loading || submissions.data?.length"
:columns="submissionColumns"
:rows="submissions.data"
rowKey="name"
:options="{
selectable: true,
}"
>
<ListHeader
class="mb-2 grid items-center space-x-4 rounded bg-surface-gray-2 p-2"
>
<ListHeaderItem
:item="item"
v-for="item in submissionColumns"
:key="item.key"
>
<template #prefix="{ item }">
<FeatherIcon :name="item.icon?.toString()" class="h-4 w-4" />
</template>
</ListHeaderItem>
</ListHeader>
<ListRows>
<router-link
v-for="row in submissions.data"
:to="{
name: 'ProgrammingExerciseSubmission',
params: {
exerciseID: row.exercise,
submissionID: row.name,
},
}"
>
<ListRow :row="row">
<template #default="{ column, item }">
<ListRowItem :item="row[column.key]" :align="column.align">
<template #prefix>
<div v-if="column.key == 'member_name'">
<Avatar
class="flex items-center"
:image="row['member_image']"
:label="item"
size="sm"
/>
</div>
</template>
<div v-if="column.key == 'status'">
<Badge
:theme="row[column.key] === 'Passed' ? 'green' : 'red'"
>
{{ row[column.key] }}
</Badge>
</div>
<div v-else>
{{ row[column.key] }}
</div>
</ListRowItem>
</template>
</ListRow>
</router-link>
</ListRows>
<ListSelectBanner>
<template #actions="{ unselectAll, selections }">
<div class="flex gap-2">
<Button
variant="ghost"
@click="deleteExercises(selections, unselectAll)"
>
<Trash2 class="h-4 w-4 stroke-1.5" />
</Button>
</div>
</template>
</ListSelectBanner>
</ListView>
<EmptyState v-else type="Programming Exercise Submissions" />
<div
v-if="submissions.data && submissions.hasNextPage"
class="flex justify-center my-5"
>
<Button @click="submissions.next()">
{{ __('Load More') }}
</Button>
</div>
</div>
</template>
<script setup lang="ts">
import {
Avatar,
Badge,
Breadcrumbs,
Button,
createListResource,
FeatherIcon,
FormControl,
ListView,
ListHeader,
ListHeaderItem,
ListRows,
ListRow,
ListRowItem,
ListSelectBanner,
usePageMeta,
toast,
} from 'frappe-ui'
import type {
ProgrammingExerciseSubmission,
Filters,
} from '@/pages/ProgrammingExercises/types'
import { computed, inject, onMounted, ref, watch } from 'vue'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
import { Trash2 } from 'lucide-vue-next'
import Link from '@/components/Controls/Link.vue'
import EmptyState from '@/components/EmptyState.vue'
const { brand } = sessionStore()
const dayjs = inject('$dayjs') as any
const user = inject('$user') as any
const filterFields = ['exercise', 'member', 'status']
const filters = ref<Filters>({
exercise: '',
member: '',
status: '',
})
const router = useRouter()
onMounted(() => {
setFiltersFromRoute()
fetchBasedOnRole()
})
const setFiltersFromRoute = () => {
filterFields.forEach((field) => {
if (router.currentRoute.value.query[field]) {
filters.value[field as keyof Filters] = router.currentRoute.value.query[
field
] as string
}
})
}
const fetchBasedOnRole = () => {
if (isStudent.value) {
filters.value['member'] = user.data?.name
} else {
submissions.reload()
}
}
const submissions = createListResource({
doctype: 'LMS Programming Exercise Submission',
fields: [
'name',
'exercise',
'exercise_title',
'member_name',
'member_image',
'status',
'modified',
],
orderBy: 'modified desc',
transform(data: ProgrammingExercise[]) {
return data.map((submission: ProgrammingExerciseSubmission) => {
return {
...submission,
modified: dayjs(submission.modified).fromNow(),
}
})
},
})
watch(filters.value, () => {
let filtersToApply: Record<string, any> = {}
filterFields.forEach((field) => {
if (filters.value[field as keyof Filters]) {
filtersToApply[field] = filters.value[field as keyof Filters]
router.push({
query: {
...router.currentRoute.value.query,
[field]: filters.value[field as keyof Filters],
},
})
} else {
delete filtersToApply[field]
const query = { ...router.currentRoute.value.query }
delete query[field]
router.push({
query,
})
}
})
submissions.update({
filters: {
...filtersToApply,
},
})
submissions.reload()
})
const deleteExercises = (selections: Set<string>, unselectAll: () => void) => {
Array.from(selections).forEach(async (submission: string) => {
await submissions.delete.submit(submission)
})
unselectAll()
toast.success(__('Submissions deleted successfully'))
}
const isStudent = computed(() => {
return (
!user.data?.is_instructor &&
!user.data?.is_moderator &&
!user.data?.is_evaluator
)
})
const submissionColumns = computed(() => {
return [
{
label: __('Member'),
key: 'member_name',
width: '20%',
icon: 'user',
},
{
label: __('Exercise'),
key: 'exercise_title',
width: '30%',
icon: 'code',
},
{
label: __('Status'),
key: 'status',
width: '20%',
icon: 'check-circle',
},
{
label: __('Modified'),
key: 'modified',
width: '20%',
icon: 'clock',
align: 'right',
},
]
})
const breadcrumbs = computed(() => {
return [
{
label: __('Programming Exercise Submissions'),
route: {
name: 'ProgrammingExerciseSubmissions',
},
},
]
})
usePageMeta(() => {
return {
title: __('Programming Exercises'),
icon: brand.favicon,
}
})
</script>

View File

@@ -0,0 +1,170 @@
<template>
<header
class="sticky flex items-center justify-between top-0 z-10 border-b bg-surface-white px-3 py-2.5 sm:px-5"
>
<Breadcrumbs :items="breadcrumbs" />
<div class="space-x-2">
<router-link
:to="{
name: 'ProgrammingExerciseSubmissions',
}"
>
<Button>
<template #prefix>
<ClipboardList class="size-4 stroke-1.5" />
</template>
{{ __('Check All Submissions') }}
</Button>
</router-link>
<Button
v-if="!readOnlyMode"
variant="solid"
@click="
() => {
exerciseID = 'new'
showForm = true
}
"
>
<template #prefix>
<Plus class="h-4 w-4 stroke-1.5" />
</template>
{{ __('New') }}
</Button>
</div>
</header>
<div class="md:w-4/5 md:mx-auto p-5">
<div class="flex items-center justify-between mb-5">
<div v-if="exerciseCount" class="text-lg font-semibold text-ink-gray-9">
{{ __('{0} Exercises').format(exerciseCount) }}
</div>
<div
v-if="exercises.data?.length || exerciseCount > 0"
class="grid grid-cols-2 gap-5"
>
<!-- <FormControl
v-model="titleFilter"
:placeholder="__('Search by title')"
/>
<FormControl
v-model="typeFilter"
type="select"
:options="assignmentTypes"
:placeholder="__('Type')"
/> -->
</div>
</div>
<div
v-if="exercises.data?.length"
class="grid grid-cols-1 md:grid-cols-3 gap-4"
>
<div
v-for="exercise in exercises.data"
:key="exercise.name"
@click="
() => {
exerciseID = exercise.name
showForm = true
}
"
class="flex flex-col border rounded-md p-3 h-full hover:border-outline-gray-3 space-y-2 cursor-pointer"
>
<div class="text-lg font-semibold text-ink-gray-9">
{{ exercise.title }}
</div>
<div class="text-sm text-ink-gray-7">
{{ exercise.language }}
</div>
</div>
</div>
<EmptyState v-else type="Programming Exercises" />
<div
v-if="exercises.data && exercises.hasNextPage"
class="flex justify-center my-5"
>
<Button @click="exercises.next()">
{{ __('Load More') }}
</Button>
</div>
</div>
<ProgrammingExerciseForm
v-model="showForm"
:exerciseID="exerciseID"
v-model:exercises="exercises"
/>
</template>
<script setup lang="ts">
import { computed, inject, onMounted, ref } from 'vue'
import {
Breadcrumbs,
Button,
call,
createListResource,
usePageMeta,
} from 'frappe-ui'
import { ClipboardList, Plus } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
import ProgrammingExerciseForm from '@/pages/ProgrammingExercises/ProgrammingExerciseForm.vue'
const exerciseCount = ref<number>(0)
const readOnlyMode = window.read_only_mode
const { brand } = sessionStore()
const showForm = ref<boolean>(false)
const exerciseID = ref<string | null>('new')
const user = inject<any>('$user')
const router = useRouter()
onMounted(() => {
validatePermissions()
getExerciseCount()
})
const validatePermissions = () => {
if (
!user.data?.is_instructor &&
!user.data?.is_moderator &&
!user.data?.is_evaluator
) {
router.push({
name: 'ProgrammingExerciseSubmissions',
})
}
}
const getExerciseCount = () => {
call('frappe.client.get_count', {
doctype: 'LMS Programming Exercise',
})
.then((count: number) => {
exerciseCount.value = count
})
.catch((error: any) => {
console.error('Error fetching exercise count:', error)
})
}
const exercises = createListResource({
doctype: 'LMS Programming Exercise',
cache: ['programmingExercises'],
fields: ['name', 'title', 'language', 'problem_statement'],
auto: true,
})
usePageMeta(() => {
return {
title: __('Programming Exercises'),
icon: brand.favicon,
}
})
const breadcrumbs = computed(() => {
return [
{
label: __('Programming Exercises'),
route: { name: 'ProgrammingExercises' },
},
]
})
</script>

View File

@@ -0,0 +1,47 @@
interface ProgrammingExercise {
name: string;
title: string;
language: 'Python' | 'JavaScript';
test_cases_count: number;
problem_statement: string;
test_cases: [TestCase];
}
interface TestCase {
name: string;
input: string;
expected_output: string;
output: string;
status: 'Passed' | 'Failed';
}
type Filters = {
exercise?: string,
member?: string,
status?: string
}
type ProgrammingExercises = {
data: ProgrammingExercise[]
reload: () => void
hasNextPage: boolean
next: () => void
setValue: {
submit: (
data: ProgrammingExercise,
options?: { onSuccess?: () => void }
) => void
}
insert: {
submit: (
data: ProgrammingExercise,
options?: { onSuccess?: () => void }
) => void
}
delete: {
submit: (
name: string,
options?: { onSuccess?: () => void }
) => void
}
}

View File

@@ -215,6 +215,30 @@ const routes = [
name: 'PersonaForm',
component: () => import('@/pages/PersonaForm.vue'),
},
{
path: '/programming-exercises',
name: 'ProgrammingExercises',
component: () =>
import('@/pages/ProgrammingExercises/ProgrammingExercises.vue'),
},
{
path: '/programming-exercises/submissions',
name: 'ProgrammingExerciseSubmissions',
component: () =>
import(
'@/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue'
),
props: true,
},
{
path: '/programming-exercises/:exerciseID/submission/:submissionID',
name: 'ProgrammingExerciseSubmission',
component: () =>
import(
'@/pages/ProgrammingExercises/ProgrammingExerciseSubmission.vue'
),
props: true,
},
]
let router = createRouter({

View File

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

View File

@@ -0,0 +1,65 @@
.cm-editor {
user-select: text;
padding: 0px !important;
position: relative !important;
}
.cm-gutters {
@apply !border-0 !bg-transparent !px-1.5 !text-xs !leading-6 !text-gray-500;
}
.cm-foldGutter span {
@apply !hidden !opacity-0;
}
.cm-gutterElement {
@apply !text-left;
}
.cm-activeLine {
@apply !bg-transparent;
}
.cm-activeLineGutter {
@apply !bg-transparent text-gray-600;
}
.cm-editor {
width: 100%;
user-select: text;
}
.cm-placeholder {
@apply !leading-6 !text-gray-500;
}
.cm-scroller {
@apply !font-mono !leading-6 !text-gray-600;
}
.cm-matchingBracket {
font-weight: 500 !important;
background: none !important;
border-bottom: 1px solid #000 !important;
outline: none !important;
}
.cm-focused {
outline: none !important;
}
.cm-tooltip-autocomplete {
@apply !rounded-lg !shadow-md !bg-surface-white !p-1.5 !border-none;
}
.cm-tooltip-autocomplete > ul {
font-family: 'Inter' !important;
}
.cm-tooltip-autocomplete ul li[aria-selected='true'] {
@apply !rounded !bg-gray-200/80;
color: #000 !important;
}
.cm-completionLabel {
margin-right: 1rem !important;
}
.cm-completionDetail {
margin-left: auto !important;
}
.inline-expression .cm-content {
padding: 0 !important;
line-height: 26px !important;
}
.inline-expression .cm-placeholder {
line-height: 26px !important;
}
.inline-expression .cm-gutters {
line-height: 26px !important;
}

View File

@@ -56,12 +56,18 @@ export class Assignment {
})
return
}
this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center bg-surface-menu-bar mb-2'>
<span class="font-medium">
Assignment: ${assignment}
</span>
</div>`
return
call('frappe.client.get_value', {
doctype: 'LMS Assignment',
name: assignment,
fieldname: ['title'],
}).then((data) => {
this.wrapper.innerHTML = `<div class='border rounded-md p-4 text-center bg-surface-menu-bar mb-4'>
<span class="font-medium">
Assignment: ${data.title}
</span>
</div>`
return
})
}
renderAssignmentModal() {
@@ -79,7 +85,8 @@ export class Assignment {
app.mount(this.wrapper)
}
save(blockContent) {
save() {
if (Object.keys(this.data).length === 0) return {}
return {
assignment: this.data.assignment,
}

View File

@@ -2,6 +2,7 @@ import { watch } from 'vue'
import { call, toast } from 'frappe-ui'
import { useTimeAgo } from '@vueuse/core'
import { Quiz } from '@/utils/quiz'
import { Program } from '@/utils/program'
import { Assignment } from '@/utils/assignment'
import { Upload } from '@/utils/upload'
import { Markdown } from '@/utils/markdownParser'
@@ -148,6 +149,7 @@ export function getEditorTools() {
},
quiz: Quiz,
assignment: Assignment,
program: Program,
upload: Upload,
markdown: {
class: Markdown,
@@ -437,6 +439,17 @@ export function getSidebarLinks() {
to: 'Batches',
activeFor: ['Batches', 'BatchDetail', 'Batch', 'BatchForm'],
},
{
label: 'Programming Exercises',
icon: 'Code',
to: 'ProgrammingExercises',
activeFor: [
'ProgrammingExercises',
'ProgrammingExerciseForm',
'ProgrammingExerciseSubmissions',
'ProgrammingExerciseSubmission',
],
},
{
label: 'Certified Members',
icon: 'GraduationCap',
@@ -565,16 +578,17 @@ export const enablePlyr = () => {
})
}
export const openSettings = (category, close) => {
export const openSettings = (category, close = null) => {
const settingsStore = useSettings()
close()
if (close) {
close()
}
settingsStore.activeTab = category
settingsStore.isSettingsOpen = true
console.log(settingsStore.activeTab, settingsStore.isSettingsOpen)
}
export const cleanError = (message) => {
// Remove HTML tags but keep the text within the tags
const cleanMessage = message.replace(/<[^>]+>/g, (match) => {
return match.replace(/<\/?[^>]+(>|$)/g, '')
})

View File

@@ -0,0 +1,101 @@
import { createApp, h } from 'vue'
import { Code } from 'lucide-vue-next'
import translationPlugin from '@/translation'
import ProgrammingExerciseModal from '@/pages/ProgrammingExercises/ProgrammingExerciseModal.vue';
import { call } from 'frappe-ui';
import { usersStore } from '@/stores/user'
export class Program {
data: any;
api: any;
readOnly: boolean;
wrapper: HTMLDivElement;
constructor({ data, api, readOnly }: { data: any; api: any; readOnly: boolean }) {
this.data = data;
this.api = api;
this.readOnly = readOnly;
}
static get toolbox() {
const app = createApp({
render: () => h(Code, { size: 5, strokeWidth: 1.5 }),
})
const div = document.createElement('div')
app.mount(div)
return {
title: __('Programming Exercise'),
icon: div.innerHTML,
}
}
static get isReadOnlySupported() {
return true
}
render() {
this.wrapper = document.createElement('div')
if (Object.keys(this.data).length) {
this.renderExercise(this.data.exercise)
} else {
this.renderModal()
}
return this.wrapper
}
renderModal() {
if (this.readOnly) {
return
}
const app = createApp(ProgrammingExerciseModal, {
onSave: (exercise: string) => {
this.data.exercise = exercise
this.renderExercise(exercise)
},
})
app.use(translationPlugin)
app.mount(this.wrapper)
}
renderExercise(exercise: string) {
if (this.readOnly) {
const { userResource } = usersStore()
call('frappe.client.get_value', {
doctype: 'LMS Programming Exercise Submission',
filters: {
exercise: exercise,
member: userResource.data?.name,
},
fieldname: ['name'],
}).then((data: { name: string }) => {
let submission = data.name || 'new'
this.wrapper.innerHTML = `<iframe src="/lms/exercises/${exercise}/submission/${submission}?fromLesson=1" class="w-full h-[900px] border rounded-md"></iframe>`
})
return
}
call("frappe.client.get_value", {
doctype: 'LMS Programming Exercise',
name: exercise,
fieldname: "title"
}).then((data: { title: string }) => {
this.wrapper.innerHTML = `<div class='border rounded-md p-4 text-center bg-surface-menu-bar mb-4'>
<span class="font-medium">
Programming Exercise: ${data.title}
</span>
</div>`
return
})
}
save() {
if (!this.data.exercise) return {}
return {
exercise: this.data.exercise,
}
}
}

View File

@@ -45,7 +45,7 @@ export class Quiz {
this.wrapper.innerHTML = `<iframe src="/lms/quiz/${quiz}?fromLesson=1" class="w-full h-[500px]"></iframe>`
return
}
this.wrapper.innerHTML = `<div class='border rounded-md p-10 text-center bg-surface-menu-bar mb-2'>
this.wrapper.innerHTML = `<div class='border rounded-md p-4 text-center bg-surface-menu-bar mb-4'>
<span class="font-medium">
Quiz: ${quiz}
</span>
@@ -68,7 +68,8 @@ export class Quiz {
app.mount(this.wrapper)
}
save(blockContent) {
save() {
if (Object.keys(this.data).length === 0) return {}
return {
quiz: this.data.quiz,
}