{{ __('Test Cases') }}
-
+
-
+
{{ __('Test {0}').format(index + 1) }} -
{{ testCase.status }}
-
+
-
{{ __('Input') }}:
+
+ {{ __('Input') }}
+
{{ testCase.input }}
@@ -100,6 +113,9 @@
+
+ {{ __('Please run the code to execute the test cases.') }}
+
@@ -114,11 +130,12 @@ import {
toast,
usePageMeta,
} from 'frappe-ui'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, inject, onMounted, ref, watch } from 'vue'
import { Play, X, Check } from 'lucide-vue-next'
import { sessionStore } from '@/stores/session'
import { useRouter } from 'vue-router'
+const user = inject
('$user')
const code = ref('')
const output = ref(null)
const error = ref(null)
@@ -132,12 +149,11 @@ const testCases = ref<
status: string
}>
>([])
-const boilerplate = ref(
- `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`
-)
+const boilerplate = ref('')
const { brand } = sessionStore()
const router = useRouter()
const fromLesson = ref(false)
+const falconURL = 'https://falcon.frappe.io/'
const props = withDefaults(
defineProps<{
@@ -151,16 +167,25 @@ const props = withDefaults(
onMounted(() => {
loadFalcon()
- if (props.submissionID != 'new') {
- submission.reload()
- }
- if (!code.value) {
- code.value = boilerplate.value
- }
+ 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',
@@ -172,17 +197,76 @@ const exercise = createDocumentResource({
const submission = createDocumentResource({
doctype: 'LMS Programming Exercise Submission',
name: props.submissionID,
- cache: ['programmingExerciseSubmission', 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) {
- code.value = `${boilerplate.value}${doc.code || ''}\n`
- if (testCases.value.length === 0) {
- testCases.value = doc.test_cases || []
- }
+ checkIfUserIsPermitted(doc)
+ updateTestCases(doc)
+ updateCode(doc.code)
}
},
{ immediate: true }
@@ -191,7 +275,7 @@ watch(
const loadFalcon = () => {
return new Promise((resolve, reject) => {
const script = document.createElement('script')
- script.src = 'https://falcon.frappe.io/static/livecode.js'
+ script.src = `${falconURL}static/livecode.js`
script.onload = resolve
script.onerror = reject
document.head.appendChild(script)
@@ -246,10 +330,11 @@ const createSubmission = () => {
name: 'ProgrammingExerciseSubmission',
params: { exerciseID: props.exerciseID, submissionID: data },
})
+ fetchSubmission(data)
} else {
- submission.reload()
+ fetchSubmission(props.submissionID)
}
- toast.success(__('Submitted successfully!'))
+ toast.success(__('Submission saved!'))
})
.catch((error: any) => {
console.error('Error creating submission:', error)
@@ -267,7 +352,7 @@ const execute = (stdin = ''): Promise => {
let session = new LiveCodeSession({
base_url: 'https://falcon.frappe.io',
- runtime: 'python',
+ runtime: exercise.doc?.language.toLowerCase() || 'python',
code: code.value,
files: [{ filename: 'stdin', contents: stdin }],
onMessage: (msg: any) => {
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
index 4cf40e4b..7bdb89b8 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExerciseSubmissions.vue
@@ -26,6 +26,7 @@
doctype="User"
v-model="filters.member"
:placeholder="__('Filter by Member')"
+ :readonly="isStudent"
/>
+
+
+
+
+
+
+
({
const router = useRouter()
onMounted(() => {
- if (!user.data?.is_instructor && !user.data?.is_moderator) {
- router.push({ name: 'Courses' })
- }
+ setFiltersFromRoute()
+ fetchBasedOnRole()
+})
+
+const setFiltersFromRoute = () => {
filterFields.forEach((field) => {
if (router.currentRoute.value.query[field]) {
filters.value[field as keyof Filters] = router.currentRoute.value.query[
@@ -161,7 +179,15 @@ onMounted(() => {
] as string
}
})
-})
+}
+
+const fetchBasedOnRole = () => {
+ if (isStudent.value) {
+ filters.value['member'] = user.data?.name
+ } else {
+ submissions.reload()
+ }
+}
const submissions = createListResource({
doctype: 'LMS Programming Exercise Submission',
@@ -174,7 +200,7 @@ const submissions = createListResource({
'status',
'modified',
],
- auto: true,
+ orderBy: 'modified desc',
transform(data: ProgrammingExercise[]) {
return data.map((submission: ProgrammingExerciseSubmission) => {
return {
@@ -214,6 +240,22 @@ watch(filters.value, () => {
submissions.reload()
})
+const deleteExercises = (selections: Set, 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 [
{
diff --git a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
index 0a994b06..96d74153 100644
--- a/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
+++ b/frontend/src/pages/ProgrammingExercises/ProgrammingExercises.vue
@@ -81,7 +81,7 @@
/>